887095 - fixing API breakage
Merge pull request #1463 from lzap/i18n-fix-887095

887095 - fixing API breakage