merged external_pipette changes