SOS-1478

Merged your changes. Can you please re run build-lang? I can't merge in the laguage changes.