Index: AlarmDefs.h
===================================================================
diff -u -r2a0fa4fb67512b605c336722326ecf1c4c8cdd22 -r9e85739f24ff655aa8f58319dc8454ec1a02394f
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 2a0fa4fb67512b605c336722326ecf1c4c8cdd22)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 9e85739f24ff655aa8f58319dc8454ec1a02394f)
@@ -159,6 +159,7 @@
     ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 121,              ///< HD requests DG command with invalid parameter fault
     ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM = 122,           ///< HD sees primary load cell for reservoir 1 change too much too fast
     ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM = 123,           ///< HD sees primary load cell for reservoir 1 change too much too fast
+    ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 124,               ///< HD in treatment stopped sub-mode after rinseback completed (no escalation)
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -382,6 +383,7 @@
     { ALARM_PRIORITY_LOW,      4,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT
     { ALARM_PRIORITY_HIGH,     3,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM
     { ALARM_PRIORITY_HIGH,     3,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM
+    { ALARM_PRIORITY_LOW,     31,   0,              ALARM_ID_NO_ALARM,                            FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK
     // Priority              Rank  Escalate In      Escalate To                                   Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  UsrAck
 };
 
Index: HDDefs.h
===================================================================
diff -u -r2a0fa4fb67512b605c336722326ecf1c4c8cdd22 -r9e85739f24ff655aa8f58319dc8454ec1a02394f
--- HDDefs.h	(.../HDDefs.h)	(revision 2a0fa4fb67512b605c336722326ecf1c4c8cdd22)
+++ HDDefs.h	(.../HDDefs.h)	(revision 9e85739f24ff655aa8f58319dc8454ec1a02394f)
@@ -174,7 +174,8 @@
 /// Sub-mode states while in treatment mode
 enum Treatment_States
 {
-    TREATMENT_START_STATE = 0,              ///< Start treatment, prime blood side with gradual ramp for 1 min. while dialyzer is bypassed.  No dialysis or UF taking place
+    TREATMENT_START_STATE = 0,              ///< Start treatment - initialize treatment and go to blood prime state
+    TREATMENT_BLOOD_PRIME_STATE,            ///< Prime blood-side of dialyzer with grandual ramp for 1 min. while dialyzer is bypassed.  No dialysis or UF taking place.  No treatment time.
     TREATMENT_DIALYSIS_STATE,               ///< Perform dialysis.  Deliver Heparin as prescribed.  Deliver UF as prescribed.  Handle saline boluses as requested
     TREATMENT_STOP_STATE,                   ///< Treatment stopped.  All pumps off.  Dializer bypassed
     TREATMENT_RINSEBACK_STATE,              ///< Perform rinseback with saline.  Dialyzer bypassed. Dialysate recirculating
Index: MsgDefs.h
===================================================================
diff -u -r2a0fa4fb67512b605c336722326ecf1c4c8cdd22 -r9e85739f24ff655aa8f58319dc8454ec1a02394f
--- MsgDefs.h	(.../MsgDefs.h)	(revision 2a0fa4fb67512b605c336722326ecf1c4c8cdd22)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 9e85739f24ff655aa8f58319dc8454ec1a02394f)
@@ -270,6 +270,8 @@
     REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 22,            ///< A saline bolus is not in progress
     REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE = 23,        ///< Requested user action is disabled in current state
     REQUEST_REJECT_REASON_ALARM_IS_ACTIVE = 24,                         ///< Requested user action not allowed while alarm is active
+    REQUEST_REJECT_REASON_INVALID_COMMAND = 25,                         ///< Requested user action invalid
+    REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED = 26,                  ///< The treatment has been completed
     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