Index: HDDefs.h
===================================================================
diff -u -raec79b5976528cca7e9041b778be367e4758e7a3 -r3330b2c90ed2732c32cf78c47c78c08da71cf7dd
--- HDDefs.h	(.../HDDefs.h)	(revision aec79b5976528cca7e9041b778be367e4758e7a3)
+++ HDDefs.h	(.../HDDefs.h)	(revision 3330b2c90ed2732c32cf78c47c78c08da71cf7dd)
@@ -435,7 +435,6 @@
     SALINE_BOLUS_STATE_IDLE = 0,                        ///< No saline bolus delivery is in progress
     SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP,             ///< Wait for pumps to stop before starting bolus
     SALINE_BOLUS_STATE_IN_PROGRESS,                     ///< A saline bolus delivery is in progress
-    SALINE_BOLUS_STATE_MAX_DELIVERED,                   ///< Maximum saline bolus volume reached - no more saline bolus deliveries allowed
     NUM_OF_SALINE_BOLUS_STATES                          ///< Number of saline bolus states
 };
 typedef enum Saline_Bolus_States SALINE_BOLUS_STATE_T;  ///< Type for saline bolus state enumeration
@@ -512,6 +511,7 @@
     TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE,                             ///< Re-circulate Blood only state of the treatment re-circulate sub-mode state machine
     TREATMENT_STOP_NO_RECIRC_STATE,                                     ///< No re-circulation state of the treatment stop sub-mode state machine
     TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE,                          ///< Treatment stop recover blood detect state
+    TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE,                          ///< Treatment stop deliver saline bolus state
     NUM_OF_TREATMENT_STOP_STATES                                        ///< Number of treatment stop sub-mode states
 };
 /// Type for treatment stop states enumeration.
@@ -780,6 +780,8 @@
     HD_EVENT_PARTIAL_OCCLUSION_BASELINE,                                ///< HD event partial occlusion baseline event
     HD_EVENT_BLOOD_LEAK_ZEROING_REQUEST,                                ///< HD event blood leak zeroing request.
     HD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED,                               ///< HD event blood leak zeroing required.
+    HD_EVENT_UF_RATE_TX_DUR,                                            ///< HD event UF rate changes in treatment duration.
+    HD_EVENT_UF_RATE_TIME_TX_DUR,                                       ///< HD event UF rate time difference in treatment duration.
     NUM_OF_EVENT_IDS                                                    ///< Total number of HD events
 };
 typedef enum HD_Event_List HD_EVENT_ID_T;                               ///< Type for HD event list enumeration
@@ -815,6 +817,7 @@
     GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL,                      ///< Active cool stop user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE,               ///< RO permeate sample stop user confirmation
     GENERIC_CONFIRM_ID_RO_PERMEATE_SAMPLE_STOP_OR_DISPENSE,             ///< RO permeate sample stop or dispense
+    GENERIC_CONFIRM_ID_UF_RATE_CHANGE_IN_TX_DURATION_CHANGE,            ///< Ultrafiltration rate change in treatment duration change
     NUM_OF_GENERIC_CONFIRM_IDS,                                         ///< Total number of generic confirm IDs
 };
 typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T;                   ///< Type for generic confirm enumeration