Merge branch 'rs/diff-tree-combined-clean-up' into next