Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rf2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46 -re5006f5263e8540e730dd802016fef5973ecea4c
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e5006f5263e8540e730dd802016fef5973ecea4c)
@@ -752,9 +752,12 @@
     {
         if ( TRUE == didTimeout( timeOfLastUICheckIn, UI_COMM_TIMEOUT_IN_MS ) )
         {
-#ifndef DISABLE_UI_COMM_TO_ALARM
-            activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
-#endif
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
+            }
         }
 
         if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
@@ -780,9 +783,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-#ifndef DISABLE_CRC_ERROR
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
-#endif
     }
 }