Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rf5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc -r82327a32b9c299351ba3ab344f3b1f9116a204f8
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision f5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 82327a32b9c299351ba3ab344f3b1f9116a204f8)
@@ -166,10 +166,12 @@
 #define SYRINGE_PUMP_STALL_SPEED_THRESHOLD            0.05F                                 ///< Minimum syringe pump speed to be considered not stalled.
 
 #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS        ( 2 * MS_PER_SECOND )                 ///< Syringe pump ADC FPGA error timeout in milliseconds.
+
 #define SYRINGE_PUMP_DAC_MAX_RETRIES                  5                                     ///< Syringe pump DAC retries to write.
 #define SYRINGE_PUMP_DAC_TIMER                        ( 200 / TASK_PRIORITY_INTERVAL )      ///< Syringe pump DAC timer between retries.
 #define SYRINGE_PUMP_OCCLUSION_PERSISTENCE            50                                    ///< Syringe pump occlusion persistence timer in milliseconds.
 #define SYRINGE_PUMP_EMPTY_FORCE_COUNT                5                                     ///< Syringe pump empty force voltage count persistence.
+
 /// Defined states for the syringe pump control state machine.
 typedef enum SyringePump_States
 {
@@ -349,6 +351,7 @@
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR, 0, SYRINGE_PUMP_OFF_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, 0, SYRINGE_PUMP_RATE_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, SYRINGE_PUMP_OCCLUSION_PERSISTENCE);
     initTimeWindowedCount( TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR, SYRINGE_PUMP_OFF_ERROR_MAX_CNT, SYRINGE_PUMP_OFF_ERROR_TIME_WIN_MS );
 
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, ALARM_ID_HD_SYRINGE_PUMP_FPGA_ADC_FAULT,
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rf5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc -r82327a32b9c299351ba3ab344f3b1f9116a204f8
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 82327a32b9c299351ba3ab344f3b1f9116a204f8)
@@ -76,6 +76,9 @@
 /// Interval (in task intervals) at which to publish standby mode data to CAN bus.
 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 **********
 
 static HD_STANDBY_STATE_T handleStandbyModeStartState( void );
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rf5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc -r82327a32b9c299351ba3ab344f3b1f9116a204f8
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision f5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 82327a32b9c299351ba3ab344f3b1f9116a204f8)
@@ -260,6 +260,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The isACPowerLost function determines whether A/C power loss has
+ * been detected. This function sets the alarms blocked condition to
+ * allow smooth alarm recovery.
+ *
+ * @details Inputs: alarmStatus
+ * @details Outputs: alarmsBlockedTimer
+ * @return TRUE if A/C power loss alarm is in effect, FALSE if not
+ *************************************************************************/
+BOOL isACPowerLost( void )
+{
+    BOOL result = TRUE;
+
+    // Continue to block new alarms until the alarms are cleared.
+    if ( ( FALSE == isAlarmConditionDetected( ALARM_ID_HD_AC_POWER_LOST ) ) &&
+         ( FALSE == isAlarmConditionDetected( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT ) ) )
+    {
+        result = FALSE;
+    }
+    else
+    {
+        alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN;
+    }
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The activateAlarm function activates a given alarm.
  * @details Inputs: none
  * @details Outputs: alarmIsActive[], alarmStartedAt[], alarmStatus is updated
@@ -268,6 +295,11 @@
  *************************************************************************/
 static void activateAlarm( ALARM_ID_T alarm )
 {
+    // Block new alarms, occuring during loss of AC power
+    if ( ( TRUE == getCPLDACPowerLossDetected() ) )
+    {
+        alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN;
+    }
     // Verify valid alarm index
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc -r82327a32b9c299351ba3ab344f3b1f9116a204f8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 82327a32b9c299351ba3ab344f3b1f9116a204f8)
@@ -5598,6 +5598,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 -rf5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc -r82327a32b9c299351ba3ab344f3b1f9116a204f8
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f5d4fecd7b937ddf8e8b4ef3372541e79c7a44fc)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 82327a32b9c299351ba3ab344f3b1f9116a204f8)
@@ -940,9 +940,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 );