Merge branch 'tl/midx-docfix'