Merge branch 'tg/split-index-fixes' into maint