Merge branch 'jk/pack-corruption-post-mortem' into maint