U4-2549 - fix it differently
Merge remote-tracking branch 'origin/6.2.0' into 6.2.0