Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r368e2fde80a5cc108f61c021830c684e05fb62d5 -rc14a0220256e92a6339a444a3e1bc85e159ccce3
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 368e2fde80a5cc108f61c021830c684e05fb62d5)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c14a0220256e92a6339a444a3e1bc85e159ccce3)
@@ -1186,9 +1186,13 @@
             break;
 
         case MSG_ID_UI_INITIATE_TREATMENT_REQUEST:
-            handleUIStartTreatmentMsg( message );
+            handleInitiateTreatmentRequest( message );
             break;
 
+        case MSG_ID_UI_START_TREATMENT_REQUEST:
+            handleStartTreatmentRequest( message );
+            break;
+
         case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS:
             handleUIUserConfirmTreatmentParameters( message );
             break;
@@ -1237,8 +1241,32 @@
             handleTesterLogInRequest( message );
             break;
 
+        case MSG_ID_HD_SET_CALIBRATION_RECORD:
+            handleSetHDCalibrationRecord( message );
+            break;
+
+        case MSG_ID_HD_GET_CALIBRATION_RECORD:
+            handleGetHDCalibrationRecord( message );
+            break;
+
+        case MSG_ID_HD_SET_SYSTEM_RECORD:
+            handleSetHDSystemRecord( message );
+            break;
+
+        case MSG_ID_HD_GET_SYSTEM_RECORD:
+            handleGetHDSystemRecord( message );
+            break;
+
+        case MSG_ID_HD_GET_SERVICE_RECORD:
+            handleGetHDServiceRecord( message );
+            break;
+
+        case MSG_ID_HD_SET_SERVICE_RECORD:
+            handleSetHDServiceRecord( message );
+            break;
+
         default:
-            // TODO - unrecognized message ID received - ignore
+            // Unrecognized message ID received - ignore
             break;
     }
 
@@ -1469,6 +1497,13 @@
                 handleTestDialOutPumpHomeRequest( message );
                 break;
 
+            case MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
+                handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE:
+                handleSetFluidLeakStateDetectorOverrideRequest( message );
+
             case MSG_ID_HD_SET_OP_MODE_REQUEST:
                 handleTestSetOpModeRequest( message );
                 break;
@@ -1510,7 +1545,7 @@
                 break;
 
             default:
-                // TODO - unrecognized message ID received - ignore
+                // Unrecognized message ID received - ignore
                 break;
         }
     }