Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r995ac6377531c6b1a7459891d8c6c3762b800cab
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 995ac6377531c6b1a7459891d8c6c3762b800cab)
@@ -167,6 +167,8 @@
 static F32 disinfectantMixRatio ;                                                                              ///< Current disinfectant mixing ratio.
 static DISINFECT_NV_OPS_T disinfectNVOps;                                                                      ///< Disinfect non-volatile memory operations.
 static BOOL haveDrainParamsBeenInit[ NUM_OF_DG_RESERVOIRS ];                                                   ///< Boolean flag to indicate whether the drain parameters have been reset or not.
+static U32 maxTemperatureOutOfRangeStartTimeMS;                                                                ///< Maximum temperature out of range start time in milliseconds.
+static U32 maxCondOutOfRangeStartTimeMS;                                                                       ///< Maximum conductivity out of range start time in milliseconds.
 
 #ifndef _RELEASE_
 /* Nelson Labs is in charge of testing the efficacy of the disinfects (heat and chem). The codes that contain the name Nelson are used to
@@ -225,7 +227,8 @@
  * alarmDetectedPendingTrigger, flushCircWaitTime, flushDisinfectantWaitTime
  * primeAcidSteadyStateCounter, rsrvrFillStableTimeCounter,  R1FullVolume,
  * rsrvrFillToFullStableTimeCounter, R2FullVolume, disinfectantMixRatio,
- * haveDrainParamsBeenInit[ DG_RESERVOIR_1 ], haveDrainParamsBeenInit[ DG_RESERVOIR_2 ]
+ * haveDrainParamsBeenInit[ DG_RESERVOIR_1 ], haveDrainParamsBeenInit[ DG_RESERVOIR_2 ],
+ * maxTemperatureOutOfRangeStartTimeMS, maxCondOutOfRangeStartTimeMS
  * @return none
  *************************************************************************/
 void initChemicalDisinfectMode( void )
@@ -268,14 +271,13 @@
     R1FullVolume                               = 0.0F;
     R2FullVolume                               = 0.0F;
     disinfectantMixRatio                       = 0.0F;
+    maxTemperatureOutOfRangeStartTimeMS        = getMSTimerCount();
+    maxCondOutOfRangeStartTimeMS               = getMSTimerCount();
 
 #ifndef _RELEASE_
     setNelsonSupportConditions();
 #endif
 
-    initPersistentAlarm( ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE, DISINFECT_TEMP_OUT_OF_RANGE_TIMEOUT_MS, DISINFECT_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE, DISINFECT_COND_OUT_OF_RANGE_TIMEOUT_MS, DISINFECT_COND_OUT_OF_RANGE_TIMEOUT_MS );
-
     requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, PARK_CONC_PUMPS );
 }
 
@@ -1656,11 +1658,12 @@
  *************************************************************************/
 static void monitorModeChemicalDisinfect( void )
 {
+    BOOL signalMaxTempOrMaxCondIsOutOfRange = FALSE;
+
     // Reservoir leak detection.
     if ( ( DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 == chemDisinfectState ) || ( DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1 == chemDisinfectState ) )
     {
         BOOL isRsrvrVolumeOutOfRange = FALSE;
-        //isRsrvrLeaking               = FALSE;
 
         if ( DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 == chemDisinfectState )
         {
@@ -1721,27 +1724,26 @@
         F32 cd2CondUSCM      = getConductivityValue( (U32)CONDUCTIVITYSENSORS_CD2_SENSOR );
         F32 TPoTemp          = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
         BOOL isCD2OutofRange = ( ( cd2CondUSCM < MIN_DISINFECT_CONDUCTIVITY_US_PER_CM ) || ( cd2CondUSCM > MAX_DISINFECT_CONDUCTIVITY_US_PER_CM ) ? TRUE : FALSE );
-        BOOL isTPoOutofRange = ( TPoTemp > MAX_DISINFECT_TPO_TEMPERATURE_C );
+        BOOL isTPoOutofRange = ( TPoTemp > MAX_DISINFECT_TPO_TEMPERATURE_C ? TRUE : FALSE );
 
-#ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) )
+        maxTemperatureOutOfRangeStartTimeMS = ( TRUE == isTPoOutofRange ? maxTemperatureOutOfRangeStartTimeMS : getMSTimerCount() );
+        maxCondOutOfRangeStartTimeMS        = ( TRUE == isCD2OutofRange ? maxCondOutOfRangeStartTimeMS : getMSTimerCount() );
+
+        if ( TRUE == didTimeout( maxTemperatureOutOfRangeStartTimeMS, DISINFECT_TEMP_OUT_OF_RANGE_TIMEOUT_MS ) )
         {
-            isCD2OutofRange = FALSE;
+            signalMaxTempOrMaxCondIsOutOfRange = TRUE;
+            alarmDetectedPendingTrigger        = ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE;
         }
-#endif
 
-        checkPersistentAlarm( ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE, isCD2OutofRange, cd2CondUSCM, MAX_DISINFECT_CONDUCTIVITY_US_PER_CM );
-        checkPersistentAlarm( ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE, isTPoOutofRange, TPoTemp, MAX_DISINFECT_TPO_TEMPERATURE_C );
-
-        if ( ( TRUE == isAlarmActive( ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE ) ) ||
-             ( TRUE == isAlarmActive( ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE ) ) )
+        if ( ( TRUE == didTimeout( maxCondOutOfRangeStartTimeMS, DISINFECT_COND_OUT_OF_RANGE_TIMEOUT_MS ) ) &&
+             ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
         {
-            prevChemDisinfectState = chemDisinfectState;
-            chemDisinfectState     = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+            signalMaxTempOrMaxCondIsOutOfRange = TRUE;
+            alarmDetectedPendingTrigger        = ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE;
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) || ( TRUE == signalMaxTempOrMaxCondIsOutOfRange ) )
     {
         if ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH )
         {