Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint