Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r1240b612f790f931825aba86ec37f37eccce9336 -r91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1240b612f790f931825aba86ec37f37eccce9336)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd)
@@ -1082,8 +1082,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
             }
         }
@@ -1273,10 +1273,30 @@
             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_HD_SET_CALIBRATION_RECORD:
+            handleSetHDCalibrationRecord( message );
+            break;
+
         case MSG_ID_UI_HD_SET_RTC_REQUEST:
             handleUIClockSyncRequest( message );
             break;
@@ -1289,10 +1309,15 @@
             handleUIPOSTFinalResult( message );
             break;
 
+        // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;
 
+        case MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST:
+            handleSetHDStandbyDisinfectSubmodeRequest( message );
+            break;
+
         default:
             // Un-recognized or un-handled message ID received - ignore
             break;
@@ -1597,6 +1622,14 @@
                 handleTestSyringePumpMeasuredVolumeOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_VALVES_CURRENT_OVERRIDE:
+                handleTestValvesCurrentOverrideRequest( message );
+                break;
+
+            case MSD_ID_HD_VALVES_POSITION_COUNT_OVERRIDE:
+                handleTestValvesPositionCountOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE:
                 handleTestMonitoredVoltagesSendIntervalOverrideRequest( message );
                 break;