Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r0970cd6acc62242201769feada1cf7f5cc01508a -r53fa5b74d40bf3775d2a0cd50309daf100e94652
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 0970cd6acc62242201769feada1cf7f5cc01508a)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 53fa5b74d40bf3775d2a0cd50309daf100e94652)
@@ -678,9 +678,7 @@
             isTD2Out = ( fabs( TD2Temp - avgTemp ) > MAX_FLUSH_CIRC_TEMP_SENSOR_DIFF_C ? TRUE : FALSE );
         }
 
-#ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
-#endif
+        if ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE )
         {
             isCD2Out = ( cd2Conductivity > MAX_FLUSH_CIRC_CONDUCTIVITY_US_PER_CM ? TRUE : FALSE );
             isCPoOut = ( cpoConductivity > MAX_FLUSH_CIRC_CONDUCTIVITY_US_PER_CM ? TRUE : FALSE );
@@ -752,8 +750,7 @@
     handleDisinfectantMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, disinfectantMixRatio );
 
 #ifndef _RELEASE_
-    if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) != SW_CONFIG_ENABLE_VALUE ) &&
-         ( nelsonSupport != NELSON_CHEM_DISINFECT ) )
+    if ( nelsonSupport != NELSON_CHEM_DISINFECT )
 #endif
     {
         if ( cd2Conductivity < MIN_PRIME_ACID_CONDUCTIVITY_US_PER_CM )
@@ -815,12 +812,10 @@
         F32 cd2Cond          = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
         BOOL isCD2OutOfRange = ( ( cd2Cond < MIN_DISINFECT_CONDUCTIVITY_US_PER_CM || cd2Cond > MAX_DISINFECT_CONDUCTIVITY_US_PER_CM ) ? TRUE : FALSE );
 
-#ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) )
+        if ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE )
         {
             isCD2OutOfRange = FALSE;
         }
-#endif
 
         if ( TRUE == isCD2OutOfRange )
         {
@@ -1654,10 +1649,12 @@
  * chemical disinfect is cancelled. If the conductivity of the diluted disinfectant
  * mix is not within the specified limits, an alarm is set and disinfect is
  * cancelled.
- * @details Inputs: chemDisinfectState, reservoir volumes, reservoir volume monitor timer,
- * inlet water temperature, pressure, and conductivity, disinfectant conductivity.
- * @details Outputs: prevChemDisinfectState, chemDisinfectState, cancel state,
- * alarmDetectedPendingTrigger
+ * @details Inputs: chemDisinfectState, R1FullVolume, isRsrvrLeaking,
+ * rsrvrsVolMonitorCounter, maxTemperatureOutOfRangeStartTimeMS,
+ * maxCondOutOfRangeStartTimeMS
+ * @details Outputs: chemDisinfectState, isRsrvrLeaking, rsrvrsVolMonitorCounter,
+ * alarmDetectedPendingTrigger, prevChemDisinfectState,
+ * maxTemperatureOutOfRangeStartTimeMS, maxCondOutOfRangeStartTimeMS
  * @return: none
  *************************************************************************/
 static void monitorModeChemicalDisinfect( void )
@@ -1707,8 +1704,8 @@
         if ( ( ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) ) ) &&
              ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
         {
-            prevChemDisinfectState      = chemDisinfectState;
-            chemDisinfectState          = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+            prevChemDisinfectState = chemDisinfectState;
+            chemDisinfectState     = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
 
             if ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) )
             {