Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r48ea28a08999dcf46985b20ea635fa504f569e57 -r6e3bbb4c27eae91fed11b118cced935a04c6b90a
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 48ea28a08999dcf46985b20ea635fa504f569e57)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 6e3bbb4c27eae91fed11b118cced935a04c6b90a)
@@ -248,31 +248,34 @@
  *************************************************************************/
 void checkInletWaterConductivity( void )
 {
-#ifndef DISABLE_WATER_QUALITY_CHECK
-    F32 conductivity             = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
-    BOOL isConductTooLow         = ( conductivity < MAX_COND_SENSOR_CPI_WARNING_LOW ? TRUE : FALSE );
-    BOOL isConductInWarningRange = ( conductivity > MAX_COND_SENSOR_CPI_WARNING_HIGH ? TRUE : FALSE );
-
-    // Warning per PRS 403
-    if ( TRUE == isConductTooLow )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW );
-    }
-    else if ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW )
-    {
-        checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW );
-    }
+        F32 conductivity             = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
+        BOOL isConductTooLow         = ( conductivity < MAX_COND_SENSOR_CPI_WARNING_LOW ? TRUE : FALSE );
+        BOOL isConductInWarningRange = ( conductivity > MAX_COND_SENSOR_CPI_WARNING_HIGH ? TRUE : FALSE );
 
-    // Warning per PRS 404
-    if ( TRUE == isConductInWarningRange )
-    {
-        checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductInWarningRange, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH );
+        // Warning per PRS 403
+        if ( TRUE == isConductTooLow )
+        {
+            checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW );
+        }
+        else if ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW )
+        {
+            checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW );
+        }
+
+        // Warning per PRS 404
+        if ( TRUE == isConductInWarningRange )
+        {
+            checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductInWarningRange, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH );
+        }
+        else if ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH )
+        {
+            checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH );
+        }
     }
-    else if ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH )
-    {
-        checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH );
-    }
-#endif
 }
 
 /*********************************************************************//**
@@ -286,17 +289,20 @@
  *************************************************************************/
 void checkRORejectionRatio( void )
 {
-#ifndef DISABLE_RO_RATIO_CHECK
-    F32 cpo                    = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
-    BOOL isRORectionOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ? TRUE : FALSE );
-    BOOL isCPoOutOfRange       = ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW ? TRUE : FALSE );
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_RO_RATIO_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+    {
+        F32 cpo                    = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
+        BOOL isRORectionOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ? TRUE : FALSE );
+        BOOL isCPoOutOfRange       = ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW ? TRUE : FALSE );
 
-    // Fault alarm per PRS 483
-    checkPersistentAlarm( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, isCPoOutOfRange, cpo, MAX_CPO_CONDUCTIVITY_ALLOW );
+        // Fault alarm per PRS 483
+        checkPersistentAlarm( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, isCPoOutOfRange, cpo, MAX_CPO_CONDUCTIVITY_ALLOW );
 
-    // Fault alarm per PRS 483
-    checkPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, isRORectionOutOfRange, roRejectionRatio, MAX_RO_REJECTION_RATIO_ALLOW );
-#endif
+        // Fault alarm per PRS 483
+        checkPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, isRORectionOutOfRange, roRejectionRatio, MAX_RO_REJECTION_RATIO_ALLOW );
+    }
 }
 
 /*********************************************************************//**
@@ -398,19 +404,25 @@
             ++internalErrorCount[ sensorId ];
             if ( internalErrorCount[ sensorId ] > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
-#ifndef DISABLE_COND_SENSOR_CHECK
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, sensorId );
+#ifndef _RELEASE_
+                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_COND_SENSOR_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+                {
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, sensorId );
+                }
             }
         }
     }
     else
     {
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
-#ifndef DISABLE_COND_SENSOR_CHECK
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, sensorId );
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_COND_SENSOR_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+            {
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, sensorId );
+            }
         }
     }
 }
@@ -552,9 +564,12 @@
     {
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
-#ifndef DISABLE_COND_SENSOR_CHECK
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, CONDUCTIVITYSENSORS_CD1_SENSOR, CONDUCTIVITYSENSORS_CD2_SENSOR );
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_COND_SENSOR_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+            {
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, CONDUCTIVITYSENSORS_CD1_SENSOR, CONDUCTIVITYSENSORS_CD2_SENSOR );
+            }
         }
     }
 }