Merge branch 'dw/subtree-split-do-not-drop-merge'