Index: HDDefs.h
===================================================================
diff -u -r4735c252d5748ce4bc77d70144de630a68e35813 -r3f8612e051100f56eb5e643a75b68c87d8eef20e
--- HDDefs.h	(.../HDDefs.h)	(revision 4735c252d5748ce4bc77d70144de630a68e35813)
+++ HDDefs.h	(.../HDDefs.h)	(revision 3f8612e051100f56eb5e643a75b68c87d8eef20e)
@@ -689,12 +689,17 @@
     DIALYSATE_FLOW_RATE_CHANGE_EVENT,                                   ///< Dialysate flow rate change event
     TREATMENT_DURATION_CHANGE_EVENT,                                    ///< Treatment duration change event
     UF_VOLUME_CHANGE_EVENT,                                             ///< Ultrafiltration volume change event
-    UF_PAUSE_RESUME_EVENT,                                              ///< Ultrafiltration pause/resume event
+    UF_RATE_CHANGE_EVENT,                                               ///< Ultrafiltration rate change event
+    UF_START_RESUME_EVENT,                                              ///< Ultrafiltration start or resume event
+    UF_PAUSE_EVENT,                                                     ///< Ultrafiltration pause event
     ARTERIAL_PRESSURE_LOWER_LIMIT_CHANGE_EVENT,                         ///< Arterial pressure lower limit change event
     ARTERIAL_PRESSURE_UPPER_LIMIT_CHANGE_EVENT,                         ///< Arterial pressure upper limit change event
     VENOUS_PRESSURE_LOWER_LIMIT_CHANGE_EVENT,                           ///< Venous pressure lower limit change event
     VENOUS_PRESSURE_UPPER_LIMIT_CHANGE_EVENT,                           ///< Venous pressure upper limit change event
-    HEPARIN_PAUSE_RESUME_EVENT,                                         ///< Heparin pause/resume event
+    HEPARIN_BOLUS_START_EVENT,                                          ///< Heparin bolus start event
+    HEPARIN_BOLUS_END_EVENT,                                            ///< Heparin bolus end event
+    HEPARIN_START_RESUME_EVENT,                                         ///< Heparin start or resume event
+    HEPARIN_STOP_PAUSE_EVENT,                                           ///< Heparin stop or pause event
     SALINE_BOLUSES_CHANGE_EVENT,                                        ///< Saline boluses change event
     MID_TREATMENT_RINSE_BACK_EVENT,                                     ///< Mid treatment rinse-back event
     NUM_OF_TX_EVENT_IDS                                                 ///< Total number of treatment events
Index: MsgDefs.h
===================================================================
diff -u -re2521ac0d7c4307390297c1d644f0f696d880703 -r3f8612e051100f56eb5e643a75b68c87d8eef20e
--- MsgDefs.h	(.../MsgDefs.h)	(revision e2521ac0d7c4307390297c1d644f0f696d880703)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 3f8612e051100f56eb5e643a75b68c87d8eef20e)
@@ -205,6 +205,8 @@
     MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE = 0xAD,                     ///< HD Confirm installation response
     MSG_ID_DG_FILL_MODE_DATA = 0xAE,                                    ///< DG broadcast of fill mode data such as used acid & bicarb volume
     MSG_ID_DG_BAD_FILL_SUB_STATE = 0xAF,                                ///< DG broadcast of idle mode bad fill sub-state
+    MSG_ID_UI_REQUEST_SERVICE_MODE = 0xB0,                              ///< UI request to HD to go to service mode
+    MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST = 0xB1,                     ///< HD response to UI request to go to service mode
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
@@ -340,6 +342,9 @@
     MSG_ID_HD_GET_USAGE_INFO_RECORD = 0x807E,                           ///< HD get usage information record
     MSG_ID_HD_SET_USAGE_INFO_RECORD = 0x807F,                           ///< HD set usage information record
     MSG_ID_HD_SEND_USAGE_INFO_RECORD = 0x8080,                          ///< HD send usage information record
+    MSG_ID_HD_SET_BLOOD_LEAK_2_EMB_MODE = 0x8081,                       ///< HD set blood leak sensor to embedded mode
+    MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND = 0x8082,                 ///< HD set blood leak embedded mode command
+    MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_SET_POINT = 0x8083,               ///< HD set blood leak embedded mode set point.
 
     MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000,                            ///< First DG test message ID
     MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE,    ///< DG tester log-in
@@ -476,7 +481,7 @@
     REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE = 34,            ///< Treatment cannot initiate if DG is not in standby idle state
     REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT = 35,                  ///< Request message not formatted properly
     REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME = 36,                    ///< Given date/time is invalid
-    REQUEST_REJECT_REASON____AVAILABLE_1 = 37,                          ///< Not used - available for use
+    REQUEST_REJECT_REASON_TREATMENT_IN_PROGRESS = 37,                   ///< Treatment is in progress
     REQUEST_REJECT_REASON_BATTERY_IS_NOT_CHARGED = 38,                  ///< Battery does not have enough charge to start treatment
     REQUEST_REJECT_REASON_RINSEBACK_NOT_COMPLETED = 39,                 ///< Cannot move on to recirculate without completing full rinseback.
     REQUEST_REJECT_REASON_RESERVOIR_ONE_IS_NOT_READY = 40,              ///< Reservoir one fill is not complete