Merge branch 'wp/merge-tree-fix'