Pick up the latest changes from 4.2.2

Merge remote-tracking branch 'origin/R4_2_maintenance'