Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rbb36d57ea11a646b277c8bbb22691be2e535da22 -rcbef3eeccf761b959283d027da24ac389df48434
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision bb36d57ea11a646b277c8bbb22691be2e535da22)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision cbef3eeccf761b959283d027da24ac389df48434)
@@ -160,7 +160,7 @@
  *************************************************************************/
 BOOL isHDCommunicating( void )
 {
-    return getU32OverrideValue(&hdCommunicationStatus);
+    return getU32OverrideValue( &hdCommunicationStatus );
 }
 
 /*********************************************************************//**
@@ -668,6 +668,7 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdCommunicationStatus.data = FALSE;
+        setHDOperationMode( 0, 0 );   // If HD off or not connected, consider HD mode is fault.
     }
 }
 
@@ -1028,7 +1029,7 @@
                 handleTestValveStateOverrideRequest( message );
                 break;
 
-            case MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE:
+            case MSG_ID_DG_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE:
                 handleTestValvesStatesPublishIntervalOverrideRequest( message );
                 break;
 
@@ -1185,11 +1186,11 @@
                 break;
 
             case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
-                handleFilterFlushTimePeriodOverride( message );
+                handleFilterFlushTimePeriodOverride(message);
                 break;
 
-            case MSG_ID_DG_FANS_RPM_OVERRIDE:
-                handleFansRPMOverride( message );
+            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
+                handleTestBlockMessagesRequest( message );
                 break;
 
             case MSG_ID_DG_STOP_RTC_CLOCK:
@@ -1200,10 +1201,6 @@
                 handleSetDrainPumpMeasuredRPMOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
-                handleTestBlockMessagesRequest( message );
-                break;
-
             case MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD:
                 handleTestSuperClearAlarmsRequest( message );
                 break;
@@ -1216,6 +1213,10 @@
                 handleTestFansRPMAlarmStartTimeOffsetRequest( message );
                 break;
 
+            case MSG_ID_DG_FANS_RPM_OVERRIDE:
+                handleFansRPMOverride( message );
+                break;
+
             case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE:
                 handleTestUsedAcidVolumeMLOverrideRequest( message );
                 break;
@@ -1262,14 +1263,14 @@
                 handleTestTareReservoirRequest( message );
                 break;
 
-            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
-                handleTestDrainPumpMeasuredCurrentOverride( message );
-                break;
-
             case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
                 handleTestGenIdlePublishIntervalOverride( message );
                 break;
 
+            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
+                handleSetDrainPumpMeasuredRPMOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
                 handleTestDGDrainPumpDirectionOverrideRequest( message );
                 break;