Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r2d8f95eaae3bcb7027f5e96809ddc6e9c0efbc4c -rde91824d9790638e0a17fa0278d22a3f57ed28c3
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2d8f95eaae3bcb7027f5e96809ddc6e9c0efbc4c)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
@@ -825,7 +825,7 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdIsCommunicating = FALSE;
-        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
+        //activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
     }
 }
 
@@ -1117,23 +1117,23 @@
                 break;
 
             case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE:
-                handleTestTemperatureSensorsOverrideRequest ( message );
+                handleTestTemperatureSensorsOverrideRequest( message );
                 break;
 
             case MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestTemperatureSensorsDataPublishOverrideRequest ( message );
+                handleTestTemperatureSensorsDataPublishOverrideRequest( message );
                 break;
 
             case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
-                handleTestHeatersDataPublishOverrideRequest ( message );
+                handleTestHeatersDataPublishOverrideRequest( message );
                 break;
 
             case MSG_ID_CONDUCTIVITY_OVERRIDE:
-                handleTestSetConductivityOverrideRequest ( message );
+                handleTestSetConductivityOverrideRequest( message );
                 break;
 
             case MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestSetConductivityDataPublishIntervalOverrideRequest ( message );
+                handleTestSetConductivityDataPublishIntervalOverrideRequest( message );
                 break;
 
             case MSG_ID_DG_ACCEL_OVERRIDE:
@@ -1205,10 +1205,10 @@
                 break;
 
             case MSG_ID_DG_RO_FLOW_RATE_OVERRIDE:
-                handleTestMeasuredROFlowRateOverride( message );
+                handleTestROMeasuredFlowOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE:
+            case MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW:
                 handleTestROPumpTargetFlowOverride( message );
                 break;
 
@@ -1268,12 +1268,16 @@
                 handleSetFluidLeakStateDetectorOverrideRequest( message );
                 break;
 
+            case MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE:
+                handleSetDGOpModeBroadcastIntervalOverrideRequest( message );
+                break;
+
             case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
                 handleFilterFlushTimePeriodOverride(message);
                 break;
 
-            case MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE:
-                handleSetDGOpModeBroadcastIntervalOverrideRequest( message );
+            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
+                handleTestBlockMessagesRequest( message );
                 break;
 
             default: