Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r33bcd0fcd7a3bba5f85a7e35ac63aadbe4e91671 -ra53ec9a732b139e0c6650bd14093d8100301357c
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 33bcd0fcd7a3bba5f85a7e35ac63aadbe4e91671)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a53ec9a732b139e0c6650bd14093d8100301357c)
@@ -1122,11 +1122,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:
@@ -1137,10 +1137,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;
@@ -1149,10 +1145,14 @@
                 handleTestAlarmInfoSendIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE:
-                handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( message );
+            case MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET:
+                handleTestFansRPMAlarmStartTimeOffsetRequest( message );
                 break;
 
+            case MSG_ID_DG_FANS_RPM_OVERRIDE:
+                handleFansRPMOverride( message );
+                break;
+
             case MSG_ID_DG_GET_SW_CONFIG_RECORD:
                 handleGetDGSoftwareConfigRecord( message );
                 break;