Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -r94b2082ddcec6ccb947e67714dc85ae005a2c7b6 -r304797ba69ef356e1e9436f81a624c01126d6cd1
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 94b2082ddcec6ccb947e67714dc85ae005a2c7b6)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 304797ba69ef356e1e9436f81a624c01126d6cd1)
@@ -24,9 +24,9 @@
  *  @defgroup Heaters Heaters
  *  @brief Heaters driver modules. Controls the primary and trimmer heaters.
  *  The primary heaters are manufactured by Heatron, PN: UEL14EXK2A-Rev D with
- *  operating temperature in between 5C and 95C.
+ *  fluid operating temperature in between 5 degrees C and 95 degrees C.
  *  The trimmer heater is manufactured by Heatron, PN: UEL5EXK1A-Rev D with
- *  operating temperature in between 5C and 95C.
+ *  fluid operating temperature in between 5 degrees C and 95 degrees C.
  *
  *  @addtogroup Heaters
  *  @{
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r9f3943dcab5881216ef0119e7de3a36668dea3bc -r304797ba69ef356e1e9436f81a624c01126d6cd1
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 9f3943dcab5881216ef0119e7de3a36668dea3bc)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 304797ba69ef356e1e9436f81a624c01126d6cd1)
@@ -65,7 +65,7 @@
 #define NUM_OF_TEMP_SENSORS_TO_AVG                4.0                                      ///< Number of temperature sensors to average to check the difference.
 
 // Flush and drain R1 and R2
-#define RSRVRS_FULL_VOL_ML                     1750.0                                      ///< Reservoirs 1 & 2 full volume in mL. TODo original value was 1900
+#define RSRVRS_FULL_VOL_ML                     1680.0                                      ///< Reservoirs 1 & 2 full volume in mL. TODo original value was 1900
 #define RSRVRS_PARTIAL_FILL_VOL_ML              500.0                                      ///< Reservoirs 1 & 2 partial volume in mL.
 #define RSRVRS_FULL_STABLE_TIME_COUNT    ( ( 4 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) ///< Reservoirs 1 & 2 full stable time in counts.
 #define RSRVRS_FILL_UP_TIMEOUT_MS        ( 5 * 60 * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 full fill up timeout in ms. TODO original value was 5 mins
@@ -80,7 +80,7 @@
 #define HEAT_DISINFECT_TARGET_RO_FLOW_LPM        0.9                                       ///< Heat disinfect target RO flow rate in L/min. TODO original value was 0.8
 #define HEAT_DISINFECT_MAX_RO_PRESSURE_PSI        30                                       ///< Heat disinfect maximum RO pressure in psi.
 #define HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI    10.0                                       ///< Heat disinfect target drain outlet pressure in psi.
-#define HEAT_DISINFECT_TIME_MS              ( 10 * 60 * MS_PER_SECOND )                    ///< Heat disinfect time for each section in milliseconds.  TODO original time was 10 minutes
+#define HEAT_DISINFECT_TIME_MS              ( 5 * 60 * MS_PER_SECOND )                     ///< Heat disinfect time for each section in milliseconds.  TODO original time was 10 minutes
 #define HEAT_DISINFECT_START_TEMP_TIMOUT_MS ( 4 * 60 * 60 * MS_PER_SECOND )                ///< Heat disinfect reaching to minimum temperature timeout in milliseconds. TODO figure out this timeout
 #define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS    ( 0.5 * 60 * 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        500.0                                       ///< Reservoirs 1 & 2 maximum allowed volume change when full during heat disinfect. TODO original value is 100 mL
@@ -1296,6 +1296,8 @@
             // This is the last drain of heat disinfect cycle
             isThisLastDrain = TRUE;
             stateTimer = getMSTimerCount();
+            // Set the reservoir status
+            rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
             state = DG_HEAT_DISINFECT_STATE_DRAIN_R2;
         }
     }
@@ -1464,7 +1466,7 @@
     turnOffUVReactor( OUTLET_UV_REACTOR );
 
     // De-energize all the valves
-    setValveState( VPI, VALVE_STATE_OPEN );
+    setValveState( VPI, VALVE_STATE_CLOSED );
     setValveState( VBF, VALVE_STATE_CLOSED );
     setValveState( VSP, VALVE_STATE_CLOSED );
     setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r9f3943dcab5881216ef0119e7de3a36668dea3bc -r304797ba69ef356e1e9436f81a624c01126d6cd1
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9f3943dcab5881216ef0119e7de3a36668dea3bc)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 304797ba69ef356e1e9436f81a624c01126d6cd1)
@@ -88,9 +88,6 @@
     requestConcentratePumpsOff( CONCENTRATEPUMPS_CP1 );
     requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2 );
     // UV off
-
-    resetReservoirLoadCellsOffset( DG_RESERVOIR_1 );
-    resetReservoirLoadCellsOffset( DG_RESERVOIR_2 );
 }
 
 /*********************************************************************//**
@@ -237,7 +234,7 @@
 
     // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect
     if ( ( DG_MODE_STAN == getCurrentOperationMode() && DG_STANDBY_MODE_STATE_IDLE == standbyState ) ||
-           DG_MODE_SOLO == getCurrentOperationMode() )
+         ( DG_MODE_SOLO == getCurrentOperationMode() ) )
     {
         requestNewOperationMode( DG_MODE_HEAT );
 
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r6dde3576087b002b0b94879ef1677fc19e563899 -r304797ba69ef356e1e9436f81a624c01126d6cd1
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 6dde3576087b002b0b94879ef1677fc19e563899)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 304797ba69ef356e1e9436f81a624c01126d6cd1)
@@ -465,21 +465,6 @@
 
 /*********************************************************************//**
  * @brief
- * The resetReservoirLoadCellsOffset function sets the reservoir's load cells
- * offset to zero.
- * @details Inputs: associateLoadCell[], redundantLoadCell[]
- * @details Outputs: reset reservoir's associate load cells auto calibration offset
- * @param reservoirId reservoir id
- * @return none
- *************************************************************************/
-void resetReservoirLoadCellsOffset( DG_RESERVOIR_ID_T reservoirId )
-{
-    resetLoadCellOffset( associatedLoadCell[ reservoirId ] );
-    resetLoadCellOffset( redundantLoadCell[ reservoirId ] );
-}
-
-/*********************************************************************//**
- * @brief
  * The getActiveReservoir function gets the active reservoir.
  * @details Inputs: activeReservoir
  * @details Outputs: none
Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -ra8d919375cdb830f52e82e2d1c72c8153f5f58ca -r304797ba69ef356e1e9436f81a624c01126d6cd1
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision a8d919375cdb830f52e82e2d1c72c8153f5f58ca)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 304797ba69ef356e1e9436f81a624c01126d6cd1)
@@ -71,8 +71,6 @@
 
 BOOL hasTargetFillVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId );
 BOOL hasTargetDrainVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId , U32 timeout );
-
-void resetReservoirLoadCellsOffset( DG_RESERVOIR_ID_T reservoirId );
 
 BOOL testSetDGActiveReservoirOverride( DG_RESERVOIR_ID_T value );
 BOOL testResetDGActiveReservoirOverride( void );