Merge branch 'jk/pack-bitmap'