Merge "Bug 571403 - User Interface for Tree Workflow" into develop