Merge branch 'dg/subtree-fixes'