Merge branch 'ds/index' into next