Merge branch 'jk/merge-tree-added-identically'