Merge branch 'nd/am-i18n-fix'