Merge branch 'jk/pack-objects-with-bitmap-fix'