Merge branch 'tg/fix-check-order-with-split-index' into maint