Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -recbd3443e0fbf2c84da7a66761765e74eb41407e -r844f98879b7425c207b58562e623ab960adbc357
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ecbd3443e0fbf2c84da7a66761765e74eb41407e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 844f98879b7425c207b58562e623ab960adbc357)
@@ -327,14 +327,6 @@
                     {
                         canTransmit( canREG1, lastCANPacketSentChannel, lastCANPacketSent );
                     }
-#ifdef DEBUG_ENABLED
-                    {
-                        char debugStr[100];
-                        sprintf( debugStr, "SystemComm-HD resend Last Frame. %2d\n", lastCANPacketSentChannel );
-                        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-                        sendDebugDataToUI( (U08*)debugStr );
-                    }
-#endif
                 }
                 // We must be only node on CAN bus - nobody is ACKing our transmitted frames
                 else
@@ -343,13 +335,6 @@
                     canXmitRetryCtr = MAX_XMIT_RETRIES;
                     signalCANXmitsCompleted();          // Clear pending xmit flag
                     clearCANXmitBuffers();              // Clear xmit buffers - nothing is going out right now
-#ifdef DEBUG_ENABLED
-                    {
-                        char debugStr[100];
-                        sprintf( debugStr, "SystemComm-HD is only node.\n" );
-                        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-                    }
-#endif
                 }
             }
         }
@@ -968,13 +953,6 @@
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
 #endif
     }
-#ifdef DEBUG_ENABLED
-    {
-        char debugStr[100];
-        sprintf( debugStr, "SystemComm-HD-Bad Msg CRC.\n" );
-        sendDebugDataToUI( (U08*)debugStr );
-    }
-#endif
 }
 
 /*********************************************************************//**
@@ -1156,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:
@@ -1304,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;
@@ -1557,6 +1543,14 @@
                 handleTestDialOutPumpHomeRequest( message );
                 break;
 
+            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
+                handleTestSuperClearAlarmsRequest( message );
+                break;
+
+            case MSG_ID_HD_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
+                break;
+
             case MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
                 handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1589,6 +1583,10 @@
                 handleBubbleSelfTestRequest( message );
                 break;
 
+            case MSG_ID_HD_BLOOD_PRIME_VOLUME_OVERRIDE:
+                handleBloodPrimeVolumeOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_SWITCHES_STATUS_OVERRIDE:
                 handleSetSwitchesStatusOverrideRequest( message );
                 break;
@@ -1601,14 +1599,18 @@
                 handleBatteryRemainingPercentOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_SET_OP_MODE_REQUEST:
-                handleTestSetOpModeRequest( message );
+            case MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE:
+                handleBloodPrimeSafetyVolumeOverrideRequest( message );
                 break;
 
-            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
-                handleTestSuperClearAlarmsRequest( 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;
@@ -1733,6 +1735,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;