Index: AlarmDefs.h
===================================================================
diff -u -rf2c5204f5297d72c587120c75643c9be18c9463a -r58471d24465d90cf8d2f1b6033c6c10b800ef5c8
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision f2c5204f5297d72c587120c75643c9be18c9463a)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 58471d24465d90cf8d2f1b6033c6c10b800ef5c8)
@@ -321,6 +321,7 @@
     ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE = 283,                        ///< DG load cells weight out of range
     ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 284,          ///< DG load cells primary/back up drift out of range.
     ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING = 285,                     ///< HD treatment recirculate timeout warning.
+    ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING = 286,                  ///< HD treatment rinseback complete timeout warning.
     NUM_OF_ALARM_IDS                                                        ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -736,6 +737,7 @@
     { ALARM_PRIORITY_HIGH,     3,  TRUE,  FALSE, TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE,                 0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE,   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING,              0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING,           0,              ALARM_ID_NO_ALARM },
 };  //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck TxLog  ID                                                        Escalate In     Escalate To
 
 /// Table of alarms and their rank.
@@ -989,6 +991,7 @@
     { 899, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED },
     { 899, ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW },
     { 899, ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING },
+    { 899, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING },
     { 900, ALARM_ID_EMPTY_SALINE_BAG },
     { 901, ALARM_ID_DIALYSATE_TEMPERATURE_HIGH },
     { 902, ALARM_ID_DIALYSATE_TEMPERATURE_LOW },
Index: MsgDefs.h
===================================================================
diff -u -redb44ef61d04962020433406a2079df132e73dbb -r58471d24465d90cf8d2f1b6033c6c10b800ef5c8
--- MsgDefs.h	(.../MsgDefs.h)	(revision edb44ef61d04962020433406a2079df132e73dbb)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 58471d24465d90cf8d2f1b6033c6c10b800ef5c8)
@@ -424,7 +424,7 @@
     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
-    REQUEST_REJECT_REASON_RINSEBACK_MAX_VOLUME_REACHED = 27,            ///< Rinseback volume maximum has been reached - no more additional rinsebacks allowed
+    REQUEST_REJECT_REASON_ADDL_RINSEBACK_MAX_VOLUME_REACHED = 27,       ///< Rinseback additional volume maximum has been reached - no more additional rinsebacks allowed
     REQUEST_REJECT_REASON_UF_VOLUME_NOT_SET = 28,                       ///< Ultrafiltration volume is not set yet
     REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM = 29,           ///< The user has not confirmed patient connection
     REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE = 30,     ///< Heparin cannot be paused if not currently deliverying Heparin
@@ -436,6 +436,7 @@
     REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME = 36,                    ///< Given date/time is invalid
     REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED = 37,        ///< Treatment cannot initiate if an alarm with no new treatment property has triggered before
     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.
     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