Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -re2cf7feff54dad3fc5be72619fa64b5421fc6f9f -r9e611165fe4a2eaeccd7b2a37c8e4dfc8498b526
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision e2cf7feff54dad3fc5be72619fa64b5421fc6f9f)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9e611165fe4a2eaeccd7b2a37c8e4dfc8498b526)
@@ -256,6 +256,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
@@ -264,6 +291,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 ) )
     {