Merge branch 'bc/maint-keep-pack' into maint