Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rdbfeaf78c05fc922eba6ff8c7a31ba8a9392c642 -r3f2b9de757500da37e0ed8881e4e906d94f3076c
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision dbfeaf78c05fc922eba6ff8c7a31ba8a9392c642)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3f2b9de757500da37e0ed8881e4e906d94f3076c)
@@ -1080,8 +1080,8 @@
             {
                 U16 msgID;
 
-                memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }
         }
@@ -1156,7 +1156,8 @@
             break;
 
         case MSG_ID_REQUEST_FW_VERSIONS:
-            handleFWVersionRequest( message );
+            handleFWVersionRequest( message );
+            handleHDSerialNumberRequest();
             break;
 
         case MSG_ID_DG_TEMPERATURE_DATA:
@@ -1271,10 +1272,26 @@
             handleUITreatmentLogDataRequest( message );
             break;
 
+        case MSG_ID_UI_DISINFECT_REQUEST:
+            handleUIDisinfectRequest( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             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_CHEM_DISINFECT_DATA:
+            handleChemDisinfectUIStateReadingFromDG( message );
+            break;
+
         case MSG_ID_UI_HD_SET_RTC_REQUEST:
             handleUIClockSyncRequest( message );
             break;
@@ -1291,6 +1308,19 @@
             handleUIActiveAlarmsListRequest( message );
             break;
 
+        case MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST:
+            handleSetHDStandbyDisinfectSubmodeRequest( message );
+            break;
+
+        case MSG_ID_UI_REQUEST_SERVICE_INFO:
+            handleHDServiceScheduleRequest( message );
+            break;
+
+        case MSG_ID_REQUEST_HD_USAGE_INFO:
+            handleHDUsageInfoRequest( message );
+            break;
+
+        // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;
@@ -1559,6 +1589,14 @@
                 handleBubbleSelfTestRequest( message );
                 break;
 
+            case MSG_ID_HD_SWITCHES_STATUS_OVERRIDE:
+                handleSetSwitchesStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestSwitchesPublishIntervalOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE:
                 handleBatteryRemainingPercentOverrideRequest( message );
                 break;
@@ -1603,6 +1641,10 @@
                 handleTestSyringePumpMeasuredVolumeOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_VALVES_CURRENT_OVERRIDE:
+                handleTestValvesCurrentOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE:
                 handleTestMonitoredVoltagesSendIntervalOverrideRequest( message );
                 break;