Merge branch 'ks/pack-objects-bitmap'