Fixes #4474 - i18n support