Merge branch 'jk/repack-pack-writebitmaps-config'