Merge branch 'cc/split-index-config'