Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r3ee95c7a0e4a4618837494ba59240422f594c868 -r89106884a4ac89a648cfb1175e8c8322cfde1f5b
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 3ee95c7a0e4a4618837494ba59240422f594c868)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 89106884a4ac89a648cfb1175e8c8322cfde1f5b)
@@ -8,7 +8,7 @@
 * @file    ModeHeatDisinfect.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      30-Mar-2023
+* @date    (last)      05-Jun-2023
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -79,6 +79,7 @@
 #define RSRVRS_DRAIN_TIMEOUT_MS                    ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 drain timeout in ms.
 
 // Target temperature
+#define HEAT_DISINFECT_PRIM_HEATER_FLUSH_TARGET_TEMP_C 60.0F                                                   ///< Heat disinfect primary heater flush target temperature C.
 #define HEAT_DISINFECT_PRIM_HEATER_TARGET_TEMP_C   90.0F                                                       ///< Heat disinfect primary heater target temperature in C.
 #define HEAT_DISINFECT_TRIM_HEATER_TARGET_TEMP_C   90.0F                                                       ///< Heat disinfect trimmer heater target temperature in C.
 #define HEAT_DISINFECT_CONC_PUMPS_START_TEMP_C     75.0F                                                       ///< Heat disinfect start concentrate pumps target temperature in C.
@@ -93,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.
@@ -317,7 +318,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initHeatDisinfectMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_ORANGE );
 
     return heatDisinfectState;
@@ -635,7 +636,6 @@
         stateTimer        = getMSTimerCount();
         stateTrialCounter = 0;
         state             = DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION;
-
     }
 
     return state;
@@ -724,7 +724,7 @@
             if ( nelsonSupport != NELSON_INOCULATE )
 #endif
             {
-                setHeaterTargetTemperature( DG_PRIMARY_HEATER, HEAT_DISINFECT_PRIM_HEATER_TARGET_TEMP_C );
+                setHeaterTargetTemperature( DG_PRIMARY_HEATER, HEAT_DISINFECT_PRIM_HEATER_FLUSH_TARGET_TEMP_C );
                 startHeater( DG_PRIMARY_HEATER );
             }
 
@@ -1369,6 +1369,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 )
     {
@@ -1699,7 +1700,7 @@
 
     // NOTE: the drain status should be checked once the reservoirs parameters are initialized. This is to make sure the
     // the timers for stable drain time are initialized prior to using them again
-    isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
+    isDrainComplete = hasTargetDrainToZeroBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {
@@ -1974,10 +1975,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;
+        }
     }
 }