Merge branch 'tg/test-index-v4' into maint