Merge branch 'jk/pack-shallow-always-without-bitmap' into next