Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -reb5370021e7e60c18732382a512886da0f9b276d -r8cd20927bc9f03f3ca5b04bc42f409a588880a7c
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision eb5370021e7e60c18732382a512886da0f9b276d)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 8cd20927bc9f03f3ca5b04bc42f409a588880a7c)
@@ -460,14 +460,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDialysateTemperature function gets the latest dialysate temperature.
- * @details Inputs: dgDialysateTemp
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
  * @details Outputs: none
- * @return the current dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
@@ -501,11 +501,11 @@
  * The getDGDisinfectsStates function returns the DG disinfects readings.
  * @details Inputs: none
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the current dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rab05daf4dc0398c516845da80c616181a6b62d16 -r8cd20927bc9f03f3ca5b04bc42f409a588880a7c
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ab05daf4dc0398c516845da80c616181a6b62d16)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8cd20927bc9f03f3ca5b04bc42f409a588880a7c)
@@ -48,11 +48,11 @@
 #define PRE_TREATMENT_FLUSH_FILL_TARGET_TEMP_C        45.0F             ///< Pre treatment flush fill target temperature in C.
 #define PRE_TREATMENT_NORMAL_FILL_TARGET_TEMP_C       ( 37.0F + 2.0F )  ///< Pre treatment normal fill target temperature in C.
 
-#define PRE_TREATMENT_MIN_FILL_RESERVOIR_VOLUME_ML      500             ///< Fill reservoir to this volume minimum to prep volume during development.
-#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         500             ///< Fill reservoir to this volume (in mL) to flush filter and lines.
-#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      1300            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
-#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      600             ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
-#define PRE_TREATMENT_FULL_RESERVOIR_VOLUME_ML          1500            ///< Fill reservoir to this volume minimum to prep volume during development.
+#define PRE_TREATMENT_MIN_FILL_RESERVOIR_VOLUME_ML    500               ///< Fill reservoir to this volume minimum to prep volume during development.
+#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML       500               ///< Fill reservoir to this volume (in mL) to flush filter and lines.
+#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML    1300              ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
+#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML    750               ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
+#define PRE_TREATMENT_FULL_RESERVOIR_VOLUME_ML        1500              ///< Fill reservoir to this volume minimum to prep volume during development.
 
 #define PRE_TREATMENT_FLUSH_COUNT                     2                 ///< Number of flush cycles for each reservoir.
 
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -reb5370021e7e60c18732382a512886da0f9b276d -r8cd20927bc9f03f3ca5b04bc42f409a588880a7c
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision eb5370021e7e60c18732382a512886da0f9b276d)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8cd20927bc9f03f3ca5b04bc42f409a588880a7c)
@@ -71,6 +71,7 @@
 static OVERRIDE_U32_T standbyModePublishInterval = { DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, 0 };
 
 static const U32 SERVICE_TIME_INTERVAL_S = (U32)( 365 * 0.5 * SECONDS_IN_A_DAY );              ///< HD/DG 6-month service interval in seconds.
+static BOOL homingInitiated;                                                                   ///< Flag indicates actuator homing has been initiated from standby mode.
 
 // ********** private function prototypes **********
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rab05daf4dc0398c516845da80c616181a6b62d16 -r8cd20927bc9f03f3ca5b04bc42f409a588880a7c
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ab05daf4dc0398c516845da80c616181a6b62d16)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8cd20927bc9f03f3ca5b04bc42f409a588880a7c)
@@ -5340,6 +5340,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );