Merge branch 'jt/midx-doc-fix'