Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r4b9ae4e44d44ee6577fec4c8b75aa160fea04cc7 -r4daa230ef3173ca71bab91c0c28457e6ac341797
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 4b9ae4e44d44ee6577fec4c8b75aa160fea04cc7)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 4daa230ef3173ca71bab91c0c28457e6ac341797)
@@ -58,8 +58,6 @@
 
 // Flush drain path state defines
 #define FLUSH_DRAIN_WAIT_TIME_MS                   ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Flush Drain path wait time in milliseconds.
-#define MIN_INLET_TEMPERATURE_C                    24.0F                                                       ///< Minimum water inlet temperature in C.
-#define MAX_INLET_CONDUCTIVITY_US_PER_CM           2000.0F                                                     ///< Maximum water inlet conductivity in us/cm
 
 // Flush circulation path state defines
 #define RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM    0.8F                                                        ///< RO pump target flow rate during flush/fill in L/min.
@@ -82,7 +80,7 @@
 
 // Fill and heat water
 #define HEAT_DISINFECT_TARGET_TEMPERATURE_C        82.0F                                                       ///< Heat disinfect target water temperature in C.
-#define HEAT_DISINFECT_START_TEMPERATURE_C         81.00F                                                      ///< Heat disinfect minimum acceptable temperature in C.
+#define HEAT_DISINFECT_START_TEMPERATURE_C         35.0F //81.0F                                                       ///< Heat disinfect minimum acceptable temperature in C.
 
 // R1 to R2 & R2 to R1 heat disinfect circulation
 #define HEAT_DISINFECT_TARGET_RO_FLOW_LPM          1.3F                                                        ///< Heat disinfect target RO flow rate in L/min.
@@ -607,7 +605,7 @@
             // State failed. Cancel heat disinfect mode
             else
             {
-                alarmDetectedPendingTrigger = ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE;
+                alarmDetectedPendingTrigger = ALARM_ID_DG_CLEANING_MODE_TEMP_SENSORS_DIFF_OUT_OF_RANGE;
                 prevHeatDisinfectState      = state;
                 state                       = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
             }
@@ -1326,7 +1324,7 @@
 
     // Set the heat disinfect UI state
     heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT;
-    U32 drainTimeoutMS   = RSRVRS_INITIAL_DRAIN_TIME_OUT_MS;
+    U32 drainTimeoutMS   = ( CANCELLATION_MODE_COLD == cancellationMode ? RSRVRS_INITIAL_DRAIN_TIME_OUT_MS : RSRVRS_MIX_DRAIN_TIMEOUT_MS );
 
     if ( CANCELLATION_MODE_NONE == cancellationMode )
     {