Merge branch 'ew/repack-with-bitmaps-by-default'