Index: PersistentAlarm.h
===================================================================
diff -u -rca1d590217b1bfd14f0e0682f88e04de076ff199 -r38ea2515c4f994812b682f2f57fd70398fc0d01f
--- PersistentAlarm.h	(.../PersistentAlarm.h)	(revision ca1d590217b1bfd14f0e0682f88e04de076ff199)
+++ PersistentAlarm.h	(.../PersistentAlarm.h)	(revision 38ea2515c4f994812b682f2f57fd70398fc0d01f)
@@ -48,6 +48,8 @@
     FPGA_PERS_ERROR_D43_COND_SENSOR,                            ///< CD4 Conductivity sensor.
     FPGA_PERS_ERROR_RTD_ADC_TEMP_SENSORS,                       ///< Temperature sensors.
     FPGA_PERS_ERROR_D74_COND_SENSOR,                            ///< D74 Conductivty sensor.
+    FPGA_PERS_ERROR_P9_COND_SENSOR,                             ///< P9 Conductivity sensor.
+    FPGA_PERS_ERROR_P18_COND_SENSOR,                            ///< P18 Conducitivty sensor.
     NUM_OF_FPGA_SENSOR_GROUPS                                   ///< Number of FPGA sensor groups.
 } FPGA_PERSISTENT_ALARMS_GROUP_T;
 #endif
Index: TestSupport.h
===================================================================
diff -u -r0a13fa08eb5affc1f33b82dcaaf3b3cbaa459b3b -r38ea2515c4f994812b682f2f57fd70398fc0d01f
--- TestSupport.h	(.../TestSupport.h)	(revision 0a13fa08eb5affc1f33b82dcaaf3b3cbaa459b3b)
+++ TestSupport.h	(.../TestSupport.h)	(revision 38ea2515c4f994812b682f2f57fd70398fc0d01f)
@@ -67,6 +67,7 @@
     TEST_CONFIG_FP_DISABLE_RO_CURRENT_ALARMS,                 ///< Test configuration to disable RO current alarms.
     TEST_CONFIG_FP_ENABLE_BOOST_PUMP,                         ///< Test configuration FP to enable P40 boost pump
     TEST_CONFIG_FP_ENABLE_DEFEATURE,                          ///< Test configuration FP to set sub system as defeatured
+    TEST_CONFIG_DD_FP_DISABLE_CONDUCTIVITY_SENSOR_CHECKS,        ///< Test configuration to disable conductivity sensor cal checks
     NUM_OF_TEST_CONFIGS                                       ///< Number of test configuration.
 } TEST_CONFIG_T;
 #endif