Merge branch 'nd/index-pack-l10n-buf-overflow' into maint