Merge branch 'jc/pack-bitmap-unaligned' into maint