Merge branch 'sg/split-index-test'