Merge branch 'tree-implementation' into wdat2-develop