Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r623ee38d3e18eb0f400b3070deae21bcade56ec7 -r23ad90c3d5f08e67a1142a68c73d79fedb752da9
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 623ee38d3e18eb0f400b3070deae21bcade56ec7)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 23ad90c3d5f08e67a1142a68c73d79fedb752da9)
@@ -63,8 +63,8 @@
 #define CLR_BACKUP_AUDIO_ENABLE()             {mibspiREG3->PC3 &= ~BACKUP_AUDIO_ENABLE_SPI3_PORT_MASK;} ///< Macro to disable backup alarm audio.
 
 #define ALARM_AUDIO_TEST_TONE                 4                                                         ///< Alarm audio state for continuous test tone.
-#define ALARM_AUDIO_CURRENT_HG_MIN_MA         20.0                                                      ///< Minimum audio current (high gain) during test tone self-test (in mA).  // TODO - Why is HG so low?  S/B same as LG I think.
-#define ALARM_AUDIO_CURRENT_LG_MIN_MA         60.0                                                      ///< Minimum audio current (low gain) during test tone self-test (in mA).
+#define ALARM_AUDIO_CURRENT_HG_MIN_MA         20.0F                                                     ///< Minimum audio current (high gain) during test tone self-test (in mA).  // TODO - Why is HG so low?  S/B same as LG I think.
+#define ALARM_AUDIO_CURRENT_LG_MIN_MA         60.0F                                                     ///< Minimum audio current (low gain) during test tone self-test (in mA).
 #define ALARM_AUDIO_MAX_TEST_TIME_MS          1000                                                      ///< Maximum time for audio current to reach threshold in test.
 #define MAX_ALARM_AUDIO_VOLUME_INDEX          (MAX_ALARM_VOLUME_LEVEL - 1 )                             ///< Index for maximum alarm audio volume.
 #define MIN_ALARM_AUDIO_VOLUME_INDEX          0                                                         ///< Index for minimum alarm audio volume.
@@ -247,8 +247,10 @@
     // Verify given alarm
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {
-        // No need to do anything if alarm is already active
-        if ( FALSE == alarmIsActive[ alarm ] )
+        // No need to do anything if alarm is already active, but if condition was cleared then re-trigger alarm
+        if ( ( FALSE == alarmIsActive[ alarm ] ) ||
+           ( ( FALSE == alarmIsDetected[ alarm ] ) &&
+             ( FALSE == ALARM_TABLE[ alarm ].alarmConditionClearImmed ) ) )
         {
             // If alarm status was that no alarms currently active, set this alarm as top alarm until status formally updated later
             if ( ALARM_ID_NO_ALARM == alarmStatus.alarmTop )
@@ -370,10 +372,12 @@
         // Clear alarm condition and broadcast alarm condition clear if not already cleared
         if ( TRUE == alarmIsDetected[ alarm ] )
         {
-            U32 a = (U32)alarm;
+            ALARM_ID_DATA_PUBLISH_T data;
 
+            data.alarmID = (U32)alarm;
+
             alarmIsDetected[ alarm ] = FALSE;
-            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&a, sizeof( U32 ) );
+            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
         }
     }
 }
@@ -399,9 +403,11 @@
             // Clear alarm and broadcast alarm clear if not already cleared
             if ( TRUE == alarmIsActive[ alarm ] )
             {
-                U32 a = (U32)alarm;
+                ALARM_ID_DATA_PUBLISH_T data;
+
+                data.alarmID = (U32) alarm;
 
-                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&a, sizeof( U32 ) );
+                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
                 alarmIsActive[ alarm ] = FALSE;
                 clearAlarmCondition( alarm );
 
@@ -918,6 +924,7 @@
     else
     {
         if ( alarmStatus.alarmsState < NUM_OF_ALARM_PRIORITIES )
+#ifndef _RELEASE_
         {
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
             {
@@ -927,6 +934,7 @@
             }
         }
         else
+#endif
         {
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
             setAlarmAudioState( ALARM_PRIORITY_HIGH,
@@ -1494,9 +1502,11 @@
             {
                 if ( TRUE == alarmIsActive[ a ] )
                 {
-                    U32 al = (U32)a;
+                    ALARM_ID_DATA_PUBLISH_T data;
 
-                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&al, sizeof( U32 ) );
+                    data.alarmID = (U32)a;
+
+                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
                     alarmIsActive[ a ] = FALSE;
                     alarmStartedAt[ a ].data = 0;
                     // Clear FIFO if this alarm was in it