Merge branch 'ds/sparse-diff-index'