Merge branch 'ds/mergies-with-sparse-index'