U4-3710 - bugfix
U4-3710 - fix merge
Merge remote-tracking branch 'origin/7.0.2' into 7.0.2
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2