Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r58f8416a9ff9c68ee34361ac23a46dcf56cfa79e -r2e21b8a4e52e0d1f94389acf424b5033362b63f1
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 58f8416a9ff9c68ee34361ac23a46dcf56cfa79e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2e21b8a4e52e0d1f94389acf424b5033362b63f1)
@@ -1134,8 +1134,12 @@
             break;
 
         case MSG_ID_REQUEST_FW_VERSIONS:
-            handleFWVersionRequest( message );
-            handleHDSerialNumberRequest();
+            handleFWVersionRequest( message );
+            handleHDSerialNumberRequest();
+            break;
+
+        case MSG_ID_DG_VERSION:
+            handleDGVersionResponse( message );
             break;
 
         case MSG_ID_DG_TEMPERATURE_DATA:
@@ -1282,6 +1286,10 @@
             handleUIPOSTFinalResult( message );
             break;
 
+        case MSG_ID_HD_UI_VERSION_INFO_RESPONSE:
+            handleUIVersionResponse( message );
+            break;
+
         case MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST:
             handleUIActiveAlarmsListRequest( message );
             break;
@@ -1587,14 +1595,22 @@
                 handleTestSwitchesPublishIntervalOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE:
+                handleBatteryRemainingPercentOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE:
                 handleBloodPrimeSafetyVolumeOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE:
-                handleBatteryRemainingPercentOverrideRequest( message );
+            case MSG_ID_HD_RINSEBACK_VOLUME_OVERRIDE:
+                handleRinsebackVolumeOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_RINSEBACK_SAFETY_VOLUME_OVERRIDE:
+                handleRinsebackSafetyVolumeOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestSyringePumpDataBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1703,6 +1719,50 @@
                 handleSetHDServiceRecord( message );
                 break;
 
+            case MSG_ID_HD_ALARM_STATUS_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestAlarmStatusSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_TREATMENT_TIME_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestTreatmentTimeDataSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_TREATMENT_RANGES_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestTreatmentRangesSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_TREATMENT_STOP_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestTreatmentStopDataSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_BLOOD_PRIME_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestBloodPrimeDataSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_RINSEBACK_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestRinsebackDataSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_STANDBY_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestStandbyModeDataSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_OP_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestOpModeDataSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_PRE_TREATMENT_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestPreTreatmentModeDataSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_TREATMENT_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestTreatmentModeSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_POST_TREATMENT_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestPostTreatmentModeSendIntervalOverrideRequest( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;