Fixes #4473 - i18n support