Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r7593a04d1121869dffb536f31c20c57cf571611b -r763622d5a521dcb60234be848cd12bda904a214e
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 7593a04d1121869dffb536f31c20c57cf571611b)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 763622d5a521dcb60234be848cd12bda904a214e)
@@ -251,7 +251,6 @@
 
     // Check the status of the trimmer heater
     if ( ++dgTrimmerTempCheckTimerCtr >= DG_TRIMMER_HTR_CHECK_INTERVAL )
-
     {
         dgTrimmerTempCheckTimerCtr = 0;
         if ( getCPLDACPowerLossDetected() != TRUE )
@@ -1275,6 +1274,7 @@
     }
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r7593a04d1121869dffb536f31c20c57cf571611b -r763622d5a521dcb60234be848cd12bda904a214e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 7593a04d1121869dffb536f31c20c57cf571611b)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 763622d5a521dcb60234be848cd12bda904a214e)
@@ -681,10 +681,14 @@
 static BOOL isNewAlarmBlocked( ALARM_ID_T alarm )
 {
     BOOL result = FALSE;
-    result = ( ALARM_NOT_BLOCKED == alarmsBlockedCountdownTimer ) ||
-             ( ALARM_ID_HD_AC_POWER_LOST == alarm ) ||
-             ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm );
 
+    if( ( ALARM_NOT_BLOCKED != alarmsBlockedCountdownTimer ) &&
+        ( ALARM_ID_HD_AC_POWER_LOST != alarm ) &&
+        ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT != alarm ) )
+    {
+        result = TRUE;
+    }
+
     return result;
 }