Merge branch 'nd/index-pack-error-message' into maint