Merge branch 'tg/diff-no-index-refactor'