Bug Fixes, temporarily disabled Workbench command.