Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r41de945f9c773e54e965e80d9e46def828beb732 -r2e54737c508f8665f7c6036649b7662fc70e601d
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 41de945f9c773e54e965e80d9e46def828beb732)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 2e54737c508f8665f7c6036649b7662fc70e601d)
@@ -161,6 +161,9 @@
     MSG_ID_TD_HEPARIN_DATA = 0x8C
     MSG_ID_TD_END_TREATMENT_REQUEST     = 0x8D
     MSG_ID_TD_END_TREATMENT_RESPONSE    = 0x8E
+    MSG_ID_TD_RINSEBACK_PROGRESS = 0x8F
+    MSG_ID_UI_RINSEBACK_CMD_REQUEST = 0x90
+    MSG_ID_TD_RINSEBACK_CMD_RESPONSE = 0x91
     
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
@@ -249,7 +252,7 @@
     MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005
     MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006
     MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007
-    MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008
+    MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008
     MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009
     MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A
     MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B
Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r5efa17f1320ab27b9942f50375208c75f1756600 -r2e54737c508f8665f7c6036649b7662fc70e601d
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 5efa17f1320ab27b9942f50375208c75f1756600)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 2e54737c508f8665f7c6036649b7662fc70e601d)
@@ -32,8 +32,10 @@
     TEST_CONFIG_DD_ENABLE_UF_TEMP_COMP = 10                     # (DD) Test configuration to enable Ultrafiltration temperature compensation
     TEST_CONFIG_DD_RUN_SOLO = 11                                # (DD) Test configuration to run DD alone without the other subsystems
     NUM_OF_TEST_CONFIGS = 12                                    # Number of Test Configs
+DDFPTestConfigOptions._str_list = {}
 
 @unique
 class TDTestConfigOptions(DialinEnum):
     TEST_CONFIG_ENABLE_BETA_1_HW = 0                            # Test configuration using Beta 1 Hardware
     NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
+TDTestConfigOptions._str_list = {}