Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r1761ea68fd78196f651d96140331894920d813e0 -r2cc4f0cfc6512c942864d7d302cef5df375a2081
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1761ea68fd78196f651d96140331894920d813e0)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2cc4f0cfc6512c942864d7d302cef5df375a2081)
@@ -1195,6 +1195,18 @@
             handleUFVolumeSetRequest( message );
             break;
 
+        case MSG_ID_UI_RINSEBACK_CMD:
+            handlRinsebackCmd( message );
+            break;
+
+        case MSG_ID_UI_RECIRC_CMD:
+            handleTreatmentRecircCmd( message );
+            break;
+
+        case MSG_ID_UI_TX_END_CMD:
+            handleTreatmentEndCmd( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             handleDGCmdResp( message );
             break;
@@ -1255,6 +1267,10 @@
 
             case MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE:
                 handleTestBloodFlowBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_TREATMENT_TIME_REMAINING_OVERRIDE:
+                handleTestTreatmentTimeRemainingOverrideRequest( message );
                 break;
 
             case MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE:
@@ -1431,18 +1447,21 @@
                 handleTestDialOutPumpHomeRequest( message );
                 break;
 
-            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
-                handleTestSuperClearAlarmsRequest( message );
-                break;
-
             case MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
                 handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
                 break;
 
             case MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE:
                 handleSetFluidLeakStateDetectorOverrideRequest( message );
+
+            case MSG_ID_HD_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
                 break;
 
+            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
+                handleTestSuperClearAlarmsRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;