Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r4d635c390c184a405bdc96e56ce35505fe3868c5 -r5d8a0c67beebb63c5f5455b309a16211c1de8cf0
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4d635c390c184a405bdc96e56ce35505fe3868c5)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5d8a0c67beebb63c5f5455b309a16211c1de8cf0)
@@ -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/Modes/SelfTests.c
===================================================================
diff -u -rfed8ef4f0540818dfb7ca670a65eac39c12cb25a -r5d8a0c67beebb63c5f5455b309a16211c1de8cf0
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision fed8ef4f0540818dfb7ca670a65eac39c12cb25a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 5d8a0c67beebb63c5f5455b309a16211c1de8cf0)
@@ -754,7 +754,7 @@
 
     for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
     {
-        homeValve( valve );
+        homeValve( valve, VALVE_FORCE_HOME, VALVE_NO_CARTRIDGE_PRESENT );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r4d635c390c184a405bdc96e56ce35505fe3868c5 -r5d8a0c67beebb63c5f5455b309a16211c1de8cf0
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4d635c390c184a405bdc96e56ce35505fe3868c5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5d8a0c67beebb63c5f5455b309a16211c1de8cf0)
@@ -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 );