Merge branch 'bitmap_write' into dev