Merge branch 'treechanges'