Fixes #4472 - i18n support