Merging in changes for the agilent 16700 made previously offline