back merged external pipette changes from develop