Fixing i18n issue
Merge branch 'bugid-94796' into dev