Back port of Bugs #418486 and #440360.

Signed-off-by: Martin Vojtek <martin.vojtek@oracle.com>
30 files changed