Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rb3076db63d3e6515746948fba3a4c2bf9aad9c27 -re3a7845d627546912ff9323da25a4e67b0eaeffc
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision b3076db63d3e6515746948fba3a4c2bf9aad9c27)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision e3a7845d627546912ff9323da25a4e67b0eaeffc)
@@ -374,29 +374,36 @@
         {   // 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 ] )
+            {   // do not trigger alarm if blocked by current mode/state
+                HD_OP_MODE_T opMode  = getCurrentOperationMode();
+                TREATMENT_STATE_T ts = getTreatmentState();
+
+                if ( ( ( ALARM_TABLE[ alarm ].alarmBlockRinseback != TRUE ) || ( opMode != MODE_TREA ) || ( ts != TREATMENT_RINSEBACK_STATE ) ) &&
+                     ( ( ALARM_TABLE[ alarm ].alarmBlockEndTx != TRUE ) || ( opMode != MODE_POST ) ) )
                 {
-                    ALARM_TRIGGERED_PAYLOAD_T data;
+                    // Broadcast alarm and data if alarm not already active
+                    if ( FALSE == alarmIsActive[ alarm ] )
+                    {
+                        ALARM_TRIGGERED_PAYLOAD_T data;
 
-                    data.alarm = (U32)alarm;
-                    data.almDataType1 = (U32)alarmData1.dataType;
-                    data.almData1 = alarmData1.data.uInt.data;
-                    data.almDataType2 = (U32)alarmData2.dataType;
-                    data.almData2 = alarmData2.data.uInt.data;
-                    data.almPriority = ALARM_TABLE[ alarm ].alarmPriority;
-                    data.almRank = ALARM_TABLE[ alarm ].alarmSubRank;
-                    data.almClrTopOnly = ALARM_TABLE[ alarm ].alarmClearOnly;
+                        data.alarm = (U32)alarm;
+                        data.almDataType1 = (U32)alarmData1.dataType;
+                        data.almData1 = alarmData1.data.uInt.data;
+                        data.almDataType2 = (U32)alarmData2.dataType;
+                        data.almData2 = alarmData2.data.uInt.data;
+                        data.almPriority = ALARM_TABLE[ alarm ].alarmPriority;
+                        data.almRank = ALARM_TABLE[ alarm ].alarmSubRank;
+                        data.almClrTopOnly = ALARM_TABLE[ alarm ].alarmClearOnly;
 
-                    broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
-                    // Send information for UI to log to treatment log
-                    if ( ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog ) && ( MODE_TREA == getCurrentOperationMode() ) )
-                    {
-                        sendTreatmentLogAlarmEventData( alarm, alarmData1, alarmData2 );
+                        broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
+                        // Send information for UI to log to treatment log
+                        if ( ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog ) && ( MODE_TREA == getCurrentOperationMode() ) )
+                        {
+                            sendTreatmentLogAlarmEventData( alarm, alarmData1, alarmData2 );
+                        }
                     }
+                    activateAlarm( alarm );
                 }
-                activateAlarm( alarm );
             }
         }
     }