Merge "Fixes for bugs: #6103660, #6103957, #6104457 and #6104322."