Treeexpander follow-ups

Merged Corey Berla requested to merge wip/corey/tree-crash into master

Merge request reports