LPS-40218

Please backport for RC release.

Please see email for my explaination and design choice for the language keys