Merge branch 'jt/remove-pack-bitmap-global'