Merge branch 'jn/plug-empty-tree-leak'