Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb607a94701f5844f2e850783239d1cb2df87fcd5 -r150a74dc4d92472352d14934b4359c4bf7e7450a
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b607a94701f5844f2e850783239d1cb2df87fcd5)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 150a74dc4d92472352d14934b4359c4bf7e7450a)
@@ -161,7 +161,7 @@
  *************************************************************************/
 BOOL isHDCommunicating( void )
 {
-    return getU32OverrideValue(&hdCommunicationStatus);
+    return getU32OverrideValue( &hdCommunicationStatus );
 }
 
 /*********************************************************************//**
@@ -669,6 +669,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.
     }
 }
 
@@ -882,6 +883,10 @@
             handleHDStartStopTrimmerHeaterCmd( message );
             break;
 
+        case MSG_ID_DG_PARK_CONCENTRATE_PUMPS_CMD_REQUEST:
+            handleParkConecentratePumpsCmd( message );
+            break;
+
         case MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD:
             handleDGStartStopTrimmerHeater( message );
             break;
@@ -1186,11 +1191,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:
@@ -1201,10 +1206,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;
@@ -1217,6 +1218,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;
@@ -1263,14 +1268,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;