Merge branch 'tb/midx-bitmap-corruption-fix'