Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r55feed76aeb3720115a0869d70a1cf142b35ca9c -r817b77010b4d34b7ce5fcaf60da555442cda3615
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 55feed76aeb3720115a0869d70a1cf142b35ca9c)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 817b77010b4d34b7ce5fcaf60da555442cda3615)
@@ -371,8 +371,9 @@
         if (   ( ALARM_NOT_BLOCKED == alarmsBlockedTimer )
                 || ( ALARM_ID_HD_AC_POWER_LOST == alarm )
                 || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm ) )
-        {
-            if ( FALSE == alarmNoRetrigger )
+        {   // do not re-trigger alarm if blocked by property
+            if ( ( FALSE == alarmNoRetrigger ) ||
+                 ( ( ALARM_TABLE[ alarm ].alarmNoRetrigOnRB != TRUE ) && ( ALARM_TABLE[ alarm ].alarmNoRetrigOnEndTx != TRUE ) ) )
             {
                 // Broadcast alarm and data if alarm not already active
                 if ( FALSE == alarmIsActive[ alarm ] )