Index: MsgDefs.h
===================================================================
diff -u -r86a8d915dbacdcf2a1ece823bf4b3adf83e49396 -red46903ec0b80f36d84142221c8f9b3317b64bf1
--- MsgDefs.h	(.../MsgDefs.h)	(revision 86a8d915dbacdcf2a1ece823bf4b3adf83e49396)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision ed46903ec0b80f36d84142221c8f9b3317b64bf1)
@@ -159,8 +159,9 @@
     MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST = 0x802C,                               ///< TD override request for TMP pressure
     MSG_ID_TD_REQ_CURRENT_TREATMENT_PARAMETERS = 0x802D,                            ///< TD request for current treatment parameters
     MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS = 0x802E,                            ///< TD response to request for current treatment parameters
-    MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x802F,                   ///< TD override request for operation mode data publish interval
-    MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST = 0x8030,                                    ///< TD set operation mode request
+    MSG_ID_TD_SET_TREATMENT_PARAMETER = 0x802F,                                     ///< TD set a specific treatment parameter
+    MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8030,                   ///< TD override request for operation mode data publish interval
+    MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST = 0x8031,                                    ///< TD set operation mode request
 
     MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000,                                        ///< First DD test message ID
     MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE,                ///< DD tester log-in
@@ -327,6 +328,10 @@
     REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PARAMETER = 45,                      ///< RO only mode invalid parameter
     REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH = 46,                 ///< RO only mode invalid payload length
     REQUEST_REJECT_REASON_TREATMENT_CANNOT_BE_RESUMED = 47,                         ///< Cannot resume treatment per alarm
+    REQUEST_REJECT_REASON_HEPARIN_STOP_TIME_EXCEEDS_DURATION = 48,                  ///< The Heparin stop time setting is greater than the treatment duration
+    REQUEST_REJECT_REASON_HEPARIN_STOP_TIME_WITH_NO_DISPENSE = 49,                  ///< Heparin settings are zero but stop time setting is non-zero
+    REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE = 50,                 ///< Heparin cannot be paused if not currently deliverying Heparin
+    REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED = 51,                                  ///< Heparin cannot be resumed if not paused
     NUM_OF_REQUEST_REJECT_REASONS                                                   ///< Number of settings change reject codes
 };
 typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;                   ///< Type for settings change rejection reason codes enumeration
Index: TDDefs.h
===================================================================
diff -u -rda175684273b1709b2ea70334cb7af7c3698d558 -red46903ec0b80f36d84142221c8f9b3317b64bf1
--- TDDefs.h	(.../TDDefs.h)	(revision da175684273b1709b2ea70334cb7af7c3698d558)
+++ TDDefs.h	(.../TDDefs.h)	(revision ed46903ec0b80f36d84142221c8f9b3317b64bf1)
@@ -618,11 +618,13 @@
     TREATMENT_PARAM_DIALYSATE_FLOW,                                     ///< Dialysate flow rate (in mL/min)
     TREATMENT_PARAM_TREATMENT_DURATION,                                 ///< Treatment duration (in minutes)
     TREATMENT_PARAM_SALINE_BOLUS_VOLUME,                                ///< Saline bolus volume (in mL)
+    TREATMENT_PARAM_HEPARIN_STOP_TIME,                                  ///< Heparin stop time (in minutes)
     TREATMENT_PARAM_ACID_CONCENTRATE,                                   ///< Acid concentrate type (enum)
     TREATMENT_PARAM_BICARB_CONCENTRATE,                                 ///< Bicarbonate concentrate type (enum)
     TREATMENT_PARAM_DIALYZER_TYPE,                                      ///< Dialysate type (enum)
     TREATMENT_PARAM_BP_MEAS_INTERVAL,                                   ///< Blood pressure measurement interval (in minutes)
     TREATMENT_PARAM_RINSEBACK_FLOW_RATE,                                ///< Rinseback flow rate (in mL/min)
+    TREATMENT_PARAM_RINSEBACK_VOLUME,                                   ///< Rinseback volume (in mL)
     TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_RINSEBACK_FLOW_RATE,    ///< Last unsigned integer treatment parameter
     TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW,                              ///< Arterial pressure alarm limit window (in mmHg)
     TREATMENT_PARAM_FIRST_INT = TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW,  ///< First integer treatment parameter
@@ -632,6 +634,8 @@
     TREATMENT_PARAM_LAST_INT = TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW,   ///< Last integer treatment parameter
     TREATMENT_PARAM_DIALYSATE_TEMPERATURE,                              ///< Dialysate temperature (in degC)
     TREATMENT_PARAM_FIRST_F32 = TREATMENT_PARAM_DIALYSATE_TEMPERATURE,  ///< First floating point treatment parameter
+    TREATMENT_PARAM_HEPARIN_DISPENSE_RATE,                              ///< Heparin dispense rate (in mL/hr)
+    TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME,                               ///< Heparin bolus volume (in mL)
     TREATMENT_PARAM_UF_VOLUME,                                          ///< Ultrafiltration volume (in liters) - provided separately by UI
     NUM_OF_TREATMENT_PARAMS                                             ///< Total number of treatment parameters
 };