Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r715b8517f4f25d4fa5444d1aae8d8d729ceba77c -re2e31bba8ccc7b60ba6036377799c71f9ceee63f
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 715b8517f4f25d4fa5444d1aae8d8d729ceba77c)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision e2e31bba8ccc7b60ba6036377799c71f9ceee63f)
@@ -96,7 +96,7 @@
 #define HEAT_DISINFECT_TIME_MS                     ( 10 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Heat disinfect time for each section in milliseconds.
 #define HEAT_DISINFECT_START_TEMP_TIMOUT_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           ( 0.5F * SEC_PER_MIN * MS_PER_SECOND )                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect. TODO change this to 5 seconds
-#define RSRVRS_MAX_TARGET_VOL_CHANGE_ML            100.0F                                                      ///< Reservoirs 1 & 2 maximum allowed volume change when full during heat disinfect.
+#define RSRVRS_MAX_TARGET_VOL_CHANGE_ML            250.0F               // TODO temporary change. Change back to 100             ///< 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.
@@ -1461,6 +1461,7 @@
 
     // Set the heat disinfect UI state
     heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT;
+    U32 drainTimeoutMS   = RSRVRS_INITIAL_DRAIN_TIME_OUT_MS;
 
     if ( CANCELLATION_MODE_NONE == cancellationMode )
     {
@@ -1474,7 +1475,7 @@
         // The two sensors must be less than a threshold to decide if mix drain is needed to normal drain
         if ( ( TDi < MIX_DRAIN_TEMPERATURE_THRESHOLD_C ) && ( TRo < MIX_DRAIN_TEMPERATURE_THRESHOLD_C ) )
         {
-            targetRPM = DRAIN_PUMP_TARGET_RPM;
+            targetRPM        = DRAIN_PUMP_TARGET_RPM;
             cancellationMode = CANCELLATION_MODE_COLD;
         }
         else
@@ -1483,8 +1484,9 @@
             setValveState( VPI, VALVE_STATE_OPEN );
             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
 
-            targetRPM = DRAIN_PUMP_RPM_IN_MIX_DRAIN;
+            targetRPM        = DRAIN_PUMP_RPM_IN_MIX_DRAIN;
             cancellationMode = CANCELLATION_MODE_HOT;
+            drainTimeoutMS   = RSRVRS_MIX_DRAIN_TIMEOUT_MS;
         }
 
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -1504,7 +1506,7 @@
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
         // If the cancellation water path cannot be done, got to basic cancellation path
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, drainTimeoutMS );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
@@ -1521,21 +1523,20 @@
         signalDrainPumpHardStop();
 
         prevHeatDisinfectState = state;
-        state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
+        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
     }
 
     // If reservoir 2 has already been drained and reservoir 1 is empty, reset and switch to complete
     if ( ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status ) && ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status ) )
     {
         // If the cancellation water path cannot be done, got to basic cancellation path
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, drainTimeoutMS );
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
             setValveState( VRD1, VALVE_STATE_CLOSED );
             setValveState( VRD2, VALVE_STATE_CLOSED );
             signalDrainPumpHardStop();
-
             failHeatDisinfect();
         }
     }
@@ -1544,8 +1545,9 @@
         setValveState( VRD1, VALVE_STATE_CLOSED );
         setValveState( VRD2, VALVE_STATE_CLOSED );
         signalDrainPumpHardStop();
+
         prevHeatDisinfectState = state;
-        state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
+        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
     }
 
     return state;