Fixed workbench dockblocks
Fix conflicts. Merge.