U4-4866 - fix the build
Merge branch '6.2.2' into 6.2-4931