Merge branch 'xx/diff-tree-remerge-diff-fix' into maint-2.46