Merge branch 'ds/add-rm-with-sparse-index' into maint