Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r0f6b35ef8da4d30793a181750d0a6d5898118120 -rbb23492d17539eb0d1ec14c4f2eb25e2756a6ae1
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0f6b35ef8da4d30793a181750d0a6d5898118120)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision bb23492d17539eb0d1ec14c4f2eb25e2756a6ae1)
@@ -884,6 +884,10 @@
             handleDGScheduledRunsRequest( message );
             break;
 
+        case MSG_ID_UI_REQUEST_SERVICE_MODE:
+            handleUIServiceModeRequest( message );
+            break;
+
         // NOTE: This case must be last
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1125,11 +1129,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:
@@ -1140,10 +1144,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;
@@ -1156,6 +1156,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;
@@ -1188,6 +1192,14 @@
                 handleSetDGUsageInfoRecord( message );
                 break;
 
+            case MSG_ID_DG_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
+                break;
+
+            case MSG_ID_DG_RESERVOIR_TARE_REQUEST:
+                handleTestTareReservoirRequest( message );
+                break;
+
             case MSG_ID_HD_REQUEST_DG_ALARMS:
                 handleResendAllAlarmsCommand( message );
                 break;