Merge branch 'ds/sparse-cone' into maint