Merge branch 'tg/index-v4-format'