Merge "Fix: ToolType() check -> isFromSource()."