Merge "Only re-enable contaminant detection when port is present"