Get roots moved to class controller.
Merge master