Merge branch 'jk/test-bitmap-fix'