Merge branch 'rs/merge-tree-simplify'