SOS-1728

6.2.x port. Please re-run build-lang