Merge branch 'jk/repack-silence-auto-bitmap-warning'