Workbench updates
Merge pull request #3618 from GrahamCampbell/workbench

Workbench Updates