Merge branch 'tb/midx-write'