Merge branch 'jk/diff-tree-t-fix' into next