Merge branch 'dd/t1509-i18n-fix'