Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r565ed0856be2fcf1443e3ec4cb8fe023b2c14db4 -r61be28695d75fc3ba795be4f4f77e435dde1dd11
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 565ed0856be2fcf1443e3ec4cb8fe023b2c14db4)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 61be28695d75fc3ba795be4f4f77e435dde1dd11)
@@ -943,8 +943,10 @@
 
         if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
         {
+#ifndef RUN_WITHOUT_DG
             activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
             dgIsCommunicating = FALSE;
+#endif
         }
     }
 }
@@ -1211,18 +1213,6 @@
             handleUFVolumeSetRequest( message );
             break;
 
-        case MSG_ID_UI_RINSEBACK_CMD:
-            handlRinsebackCmd( message );
-            break;
-
-        case MSG_ID_UI_RECIRC_CMD:
-            handleTreatmentRecircCmd( message );
-            break;
-
-        case MSG_ID_UI_TX_END_CMD:
-            handleTreatmentEndCmd( message );
-            break;
-
         case MSG_ID_UI_SAMPLE_WATER_CMD:
             handleSampleWaterCmd( message );
             break;
@@ -1255,6 +1245,30 @@
             handleStartTreatmentRequest( message );
             break;
 
+        case MSG_ID_UI_RINSEBACK_CMD:
+            handlRinsebackCmd( message );
+            break;
+
+        case MSG_ID_UI_RECIRC_CMD:
+            handleTreatmentRecircCmd( message );
+            break;
+
+        case MSG_ID_UI_TX_END_CMD:
+            handleTreatmentEndCmd( message );
+            break;
+
+        case MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM:
+            handlePatientDisconnectionConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM:
+            handleDisposableRemovalConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST:
+            handleUITreatmentLogDataRequest( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             handleDGCmdResp( message );
             break;
@@ -1263,8 +1277,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;
     }
 
@@ -1495,6 +1533,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;
@@ -1536,7 +1581,7 @@
                 break;
 
             default:
-                // TODO - unrecognized message ID received - ignore
+                // Unrecognized message ID received - ignore
                 break;
         }
     }