Merge branch 'nd/split-index'