Merge branch 'th/diff-no-index-fixes' into maint