Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rbec5bb7634100c96341d19cf89e540a01aa86b1d -r06ccd13d7e04a57dfb750a5d14ae4fea1525d4cc
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision bec5bb7634100c96341d19cf89e540a01aa86b1d)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 06ccd13d7e04a57dfb750a5d14ae4fea1525d4cc)
@@ -7,8 +7,8 @@
 *
 * @file    ModeHeatDisinfect.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-May-2023
+* @author  (last)      James Walter Taylor
+* @date    (last)      28-Jun-2023
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -94,8 +94,8 @@
 #define HEAT_DISINFECT_TARGET_RO_FLOW_TRANSFER_LPM 0.8F                                                        ///< Heat disinfect target RO flow rate in L/min when transferring between reservoirs.
 #define HEAT_DISINFECT_MAX_RO_PRESSURE_PSI         30                                                          ///< Heat disinfect maximum RO pressure in psi.
 #define HEAT_DISINFECT_START_TEMP_TIMEOUT_MS       ( 4 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND )          ///< Heat disinfect reaching to minimum temperature timeout in milliseconds.
-#define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 5 * MS_PER_SECOND )                                       ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect.
-#define RSRVRS_MAX_TARGET_VOL_CHANGE_ML            100.0F                                                      ///< Reservoirs 1 & 2 maximum allowed volume change when full during heat disinfect.
+#define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 10 * MS_PER_SECOND )                                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect.
+#define RSRVRS_MAX_TARGET_VOL_CHANGE_ML            150.0F                                                      ///< Reservoirs 1 & 2 maximum allowed volume change when full during heat disinfect.
 #define POST_HEAT_DISINFECT_WAIT_TIME_MS           ( 3 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Heat disinfect final wait time before flushing the system in milliseconds.
 #define HEAT_DISINFECT_MAX_TEMP_GRADIENT_C         15.0F                                                       ///< Heat disinfect maximum allowed temperature gradient in between hottest and coldest sensors.
 #define HEAT_DISINFECT_TEMP_GRAD_OUT_RANGE_TIME_MS ( 0.16 * SEC_PER_MIN * MS_PER_SECOND )                      ///< Heat disinfect temperature gradient out of range timeout in milliseconds.
@@ -318,7 +318,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initHeatDisinfectMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_ORANGE );
 
     return heatDisinfectState;
@@ -1370,6 +1370,7 @@
         setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
         // Turn on the drain pump to drain the reservoirs in open loop mode
         setDrainPumpTargetRPM( DRAIN_PUMP_RPM_IN_MIX_DRAIN );
+        turnOnUVReactor( INLET_UV_REACTOR );
     }
     else if ( TRUE == isDrainPumpInMixDrainOn )
     {
@@ -1975,10 +1976,13 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) && ( heatDisinfectState != DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) )
     {
-        prevHeatDisinfectState = heatDisinfectState;
-        heatDisinfectState     = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+        if ( heatDisinfectState != DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH )
+        {
+            prevHeatDisinfectState = heatDisinfectState;
+            heatDisinfectState     = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+        }
     }
 }