Merge branch 'ab/reverse-midx-optim' into maint