Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r82bd1d24c050e79690a7f5b236e49dd7db7e2a91 -r2a968f6aaf05bb937b524d67a5912d38e2a84049
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 82bd1d24c050e79690a7f5b236e49dd7db7e2a91)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 2a968f6aaf05bb937b524d67a5912d38e2a84049)
@@ -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 -r82bd1d24c050e79690a7f5b236e49dd7db7e2a91 -r2a968f6aaf05bb937b524d67a5912d38e2a84049
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 82bd1d24c050e79690a7f5b236e49dd7db7e2a91)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2a968f6aaf05bb937b524d67a5912d38e2a84049)
@@ -5353,6 +5353,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 );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r82bd1d24c050e79690a7f5b236e49dd7db7e2a91 -r2a968f6aaf05bb937b524d67a5912d38e2a84049
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 82bd1d24c050e79690a7f5b236e49dd7db7e2a91)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2a968f6aaf05bb937b524d67a5912d38e2a84049)
@@ -924,9 +924,6 @@
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
 BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response );
 
-// MSG_ID_HD_SEND_ALARMS_COMMAND
-void handleResendAllAlarmsCommand(  MESSAGE_T* message );
-
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );
 
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r82bd1d24c050e79690a7f5b236e49dd7db7e2a91 -r2a968f6aaf05bb937b524d67a5912d38e2a84049
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 82bd1d24c050e79690a7f5b236e49dd7db7e2a91)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 2a968f6aaf05bb937b524d67a5912d38e2a84049)
@@ -173,7 +173,7 @@
             {
                 F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
                 F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
-
+
                 // Verify 24V is down when w.d. expired
                 if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED )
                 {