Merge branch 'so/diff-index-regression-fix' into maint