[4.2] Fixed Workbench Dockblocks

Some propper fixes to replace #4903.