ToolForm: Skip new tool form build process if disabled
Merge