multilingual related fix
Merge pull request #3685 from monishdeb/45beta2-upgrade-fix

multilingual related fix