Merge branch 'sg/split-index-racefix' into maint