Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maint