Merge branch 'nd/i18n'