Merge branch 'jk/pack-idx-corruption-safety' into maint