Merge branch 'jc/diff-index-quick-exit-early' into maint