U4-4373, U4-4374 - finalize fixes
Merge remote-tracking branch 'origin/6.2.0' into 6.2.0