Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb7318644527939f0b8b01bd3999a9c187c64f40e -r91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b7318644527939f0b8b01bd3999a9c187c64f40e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd)
@@ -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
         }
     }
 }
@@ -1207,6 +1209,10 @@
             handleHeparinCommandRequest( message );
             break;
 
+        case MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD:
+            handleAlarmAudioVolumeSetCmd( message );
+            break;
+
         case MSG_ID_UI_SET_UF_VOLUME_PARAMETER:
             handleUFVolumeSetRequest( message );
             break;
@@ -1275,50 +1281,45 @@
             handleDGCmdResp( message );
             break;
 
+        case MSG_ID_DG_FLUSH_DATA:
+            handleFlushUIStateReadingFromDG( message );
+            break;
+
         case MSG_ID_DG_HEAT_DISINFECT_DATA:
             handleHeatDisinfectUIStateReadingFromDG( message );
             break;
 
-        case MSG_ID_DG_FLUSH_DATA:
-            break;
-
         case MSG_ID_DG_CHEM_DISINFECT_DATA:
+            handleChemDisinfectUIStateReadingFromDG( message );
             break;
 
-        case MSG_ID_TESTER_LOGIN_REQUEST:
-            handleTesterLogInRequest( message );
-            break;
-
         case MSG_ID_HD_SET_CALIBRATION_RECORD:
             handleSetHDCalibrationRecord( message );
             break;
 
-        case MSG_ID_HD_GET_CALIBRATION_RECORD:
-            handleGetHDCalibrationRecord( message );
+        case MSG_ID_UI_HD_SET_RTC_REQUEST:
+            handleUIClockSyncRequest( message );
             break;
 
-        case MSG_ID_HD_SET_SYSTEM_RECORD:
-            handleSetHDSystemRecord( message );
+        case MSG_ID_DG_POST_FINAL_TEST_RESULT:
+            handleDGPOSTFinalResult( message );
             break;
 
-        case MSG_ID_HD_GET_SYSTEM_RECORD:
-            handleGetHDSystemRecord( message );
+        case MSG_ID_UI_POST_FINAL_TEST_RESULT:
+            handleUIPOSTFinalResult( message );
             break;
 
-        case MSG_ID_HD_GET_SERVICE_RECORD:
-            handleGetHDServiceRecord( message );
+        // NOTE: this always must be the last case
+        case MSG_ID_TESTER_LOGIN_REQUEST:
+            handleTesterLogInRequest( message );
             break;
 
-        case MSG_ID_HD_SET_SERVICE_RECORD:
-            handleSetHDServiceRecord( message );
-            break;
-
         case MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST:
             handleSetHDStandbyDisinfectSubmodeRequest( message );
             break;
 
         default:
-            // Unrecognized message ID received - ignore
+            // Un-recognized or un-handled message ID received - ignore
             break;
     }
 
@@ -1569,6 +1570,18 @@
                 handleBloodLeakZeroRequest( message );
                 break;
 
+            case MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE:
+                handleSetBubblesDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_BUBBLE_STATUS_OVERRIDE:
+                handleSetBubbleStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST:
+                handleBubbleSelfTestRequest( message );
+                break;
+
             case MSG_ID_HD_SET_OP_MODE_REQUEST:
                 handleTestSetOpModeRequest( message );
                 break;
@@ -1617,6 +1630,74 @@
                 handleTestValvesPositionCountOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE:
+                handleTestMonitoredVoltagesSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_MONITORED_VOLTAGES_OVERRIDE:
+                handleTestMonitoredVoltageOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_INFO_SEND_INTERVAL_OVERRIDE:
+                handleTestAlarmInfoSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_AUDIO_VOLUME_LEVEL_OVERRIDE:
+                handleTestAlarmAudioVolumeOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_AUDIO_CURRENT_HG_OVERRIDE:
+                handleTestAlarmAudioCurrentHgOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_AUDIO_CURRENT_LG_OVERRIDE:
+                handleTestAlarmAudioCurrentLgOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE:
+                handleTestAlarmBackupAudioCurrentOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_STATUS_OVERRIDE:
+                handleTestSyringePumpStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE:
+                handleTestSyringePumpEncoderStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE:
+                handleTestSyringePumpADCandDACStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE:
+                handleTestSyringePumpADCReadCtrOverrideRequest( 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:
                 // Unrecognized message ID received - ignore
                 break;