Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -recc3eef231cd2527274969e057d9b4763caa273f -r85c277d3d53a82302fdecdff0a42197298d92585
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ecc3eef231cd2527274969e057d9b4763caa273f)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 85c277d3d53a82302fdecdff0a42197298d92585)
@@ -897,14 +897,15 @@
             handleDGSendConcentrateMixingRatios( message );
             break;
 
-        case MSG_ID_HD_REQUEST_DG_USAGE_INFO:
-            handleHDRequestDGUsageInfo( message );
-            break;
 
         case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
             handleServiceModeRequest( message );
             break;
 
+        case MSG_ID_HD_REQUEST_DG_USAGE_INFO:
+            handleHDRequestDGUsageInfo( message );
+            break;
+
         case MSG_ID_DG_SET_SERVICE_TIME:
             handleSetDGServiceTime( message );
             break;
@@ -1149,11 +1150,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:
@@ -1164,10 +1165,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;
@@ -1180,6 +1177,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;
@@ -1224,14 +1225,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:
+                handleTestDGDrainPumpCurrentOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
                 handleTestDGDrainPumpDirectionOverrideRequest( message );
                 break;