Merge branch 'ds/midx-with-less-memory'