Merge branch 'ks/tree-diff-nway'