Merge branch 'lt/merge-tree'