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