Merge branch 'nd/i18n-2.8.0'