Merge commit 'rusty/idtree'