Merge branch 'jk/merge-subtree-heuristics'