Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r208ceefa8e8b1cc30feb93be771ced6d313e6995 -r22cab5beebd48faf29e78c5003b0bdd0a32748e8
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 208ceefa8e8b1cc30feb93be771ced6d313e6995)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 22cab5beebd48faf29e78c5003b0bdd0a32748e8)
@@ -1137,33 +1137,14 @@
             handleHDUsageInfoRequest( message );
             break;
 
-        case MSG_ID_HD_STOP_RTC_CLOCK:
-            handleStopHDRTCClock( message );
-            break;
-
         case MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA:
             handleDGMixingRatios( message );
             break;
 
-        case MSG_ID_HD_GET_USAGE_INFO_RECORD:
-            handleGetHDUsageInfoRecord( message );
+        case MSG_ID_UI_REQUEST_SERVICE_MODE:
+            handleUIServiceModeRequest( message );
             break;
 
-        case MSG_ID_HD_SET_USAGE_INFO_RECORD:
-            handleSetHDUsageInfoRecord( message );
-            break;
-
-        case MSG_ID_HD_SET_BLOOD_LEAK_2_EMB_MODE:
-            handleSetBloodLeak2EmbeddedMode( message );
-            break;
-
-        case MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND:
-            handleSetBloodEmbeddedModeCommand( message );
-            break;
-
-        case MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_SET_POINT:
-            break;
-
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1653,6 +1634,29 @@
                 handleSetHDSoftwareConfigRecord( message );
                 break;
 
+            case MSG_ID_HD_STOP_RTC_CLOCK:
+                handleStopHDRTCClock( message );
+                break;
+
+            case MSG_ID_HD_GET_USAGE_INFO_RECORD:
+                handleGetHDUsageInfoRecord( message );
+                break;
+
+            case MSG_ID_HD_SET_USAGE_INFO_RECORD:
+                handleSetHDUsageInfoRecord( message );
+                break;
+
+            case MSG_ID_HD_SET_BLOOD_LEAK_2_EMB_MODE:
+                handleSetBloodLeak2EmbeddedMode( message );
+                break;
+
+            case MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND:
+                handleSetBloodEmbeddedModeCommand( message );
+                break;
+
+            case MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_SET_POINT:
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;