Index: leahi_dialin/dd/modules/records_get_requests.py
===================================================================
diff -u -ra3626dee9fae1f33d9fc95978beb9c8c8de676cb -r74fa8af6870dbf0faec051c4c3e05576fbfd82ab
--- leahi_dialin/dd/modules/records_get_requests.py	(.../records_get_requests.py)	(revision a3626dee9fae1f33d9fc95978beb9c8c8de676cb)
+++ leahi_dialin/dd/modules/records_get_requests.py	(.../records_get_requests.py)	(revision 74fa8af6870dbf0faec051c4c3e05576fbfd82ab)
@@ -124,6 +124,10 @@
             if cond_sensor == dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS:
                 continue
             self.cmd_request_calibration_conductivity_record(cond_sensor.value)
+        for cond_sensor in fp_enum_repository.FPConductivitySensorNames:
+            if cond_sensor == fp_enum_repository.FPConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS:
+                continue
+            self.cmd_request_calibration_conductivity_record(cond_sensor.value + dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value)
 
 
     def cmd_request_calibration_pressure_record(self, sensor_id: int) -> int:
Index: leahi_dialin/dd/modules/records_set_requests.py
===================================================================
diff -u -r088cb4b5e6c8e152496787a25a7cd0df2669efe9 -r74fa8af6870dbf0faec051c4c3e05576fbfd82ab
--- leahi_dialin/dd/modules/records_set_requests.py	(.../records_set_requests.py)	(revision 088cb4b5e6c8e152496787a25a7cd0df2669efe9)
+++ leahi_dialin/dd/modules/records_set_requests.py	(.../records_set_requests.py)	(revision 74fa8af6870dbf0faec051c4c3e05576fbfd82ab)
@@ -275,6 +275,8 @@
 
             elif group in ['COND']:
                 sensor = dd_enum_repository.DDConductivitySensorNames.from_str(record_parts[1])
+                if sensor is None:
+                    sensor = fp_enum_repository.FPConductivitySensorNames.from_str(record_parts[1])
 
                 # Set the arguments for the call
                 args = []