ToolForm: Ensure that the correct definition for booleans is used
Merge