Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -raacf1e3077a81ea0e446bdbf988a3745e0cac305 -rf6b78d1fe6741043de38707211710ab0e8a08483
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision aacf1e3077a81ea0e446bdbf988a3745e0cac305)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
@@ -310,10 +310,10 @@
                     canXmitRetryCtr = MAX_XMIT_RETRIES;
                     signalCANXmitsCompleted();          // Clear pending xmit flag
                     clearCANXmitBuffers();              // Clear xmit buffers - nothing is going out right now
-                }
-            }
-        }
-    }
+                } // end - are we retrying xmit or are we alone on CAN bus
+            } // end - pending xmit timeout?
+        } // end - transmit in progress or not
+    } // end - DG not alone on CAN bus
 }
 
 /*********************************************************************//**
@@ -753,9 +753,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 ) )
@@ -781,9 +784,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
     }
 }
 
@@ -1620,6 +1621,18 @@
                 handleTestCurrentTreamtmentParametersRequest( message );
                 break;
 
+            case MSG_ID_HD_FANS_DUTY_CYCLE_OVERRIDE:
+                handleSetFansDutyCycleOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_GET_SW_CONFIG_RECORD:
+                handleGetHDSoftwareConfigRecord( message );
+                break;
+
+            case MSG_ID_HD_SET_SW_CONFIG_RECORD:
+                handleSetHDSoftwareConfigRecord( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;