Merge branch 'nd/i18n-index-pack'