Index: AlarmDefs.h
===================================================================
diff -u -rb47892b0bd4a7b1e4805c05ed08b9c6e01b57fb9 -r74bc32e13ed69a4e5a7217f1f5098bc17ff60466
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision b47892b0bd4a7b1e4805c05ed08b9c6e01b57fb9)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 74bc32e13ed69a4e5a7217f1f5098bc17ff60466)
@@ -336,7 +336,7 @@
     { ALARM_PRIORITY_HIGH,     3,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW
     { ALARM_PRIORITY_HIGH,     3,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW
     { ALARM_PRIORITY_HIGH,     3,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_EMPTY_SALINE_BAG
-    { ALARM_PRIORITY_MEDIUM,   3,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, TRUE  }, // ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE
+    { ALARM_PRIORITY_MEDIUM,   3,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_UV_REACTOR_NOT_HEALTHY
Index: HDDefs.h
===================================================================
diff -u -r83013a57b0b7a91f650a889fb096b4141cd26f00 -r74bc32e13ed69a4e5a7217f1f5098bc17ff60466
--- HDDefs.h	(.../HDDefs.h)	(revision 83013a57b0b7a91f650a889fb096b4141cd26f00)
+++ HDDefs.h	(.../HDDefs.h)	(revision 74bc32e13ed69a4e5a7217f1f5098bc17ff60466)
@@ -175,11 +175,7 @@
     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
-    TREATMENT_RINSEBACK_PAUSE_STATE,        ///< Rinseback paused.  Blood pump off.  Dialyzer bypassed.  Dialysate recirculating
-    TREATMENT_RECIRC_SETUP_STATE,           ///< Rinseback complete.  Blood pump off.  Blood lines closed.  User to disconnect and shunt blood lines
     TREATMENT_RECIRC_STATE,                 ///< Recirculate saline and dialysate while patient disconnected.  Blood lines open and shunted.  Dialyzer is bypassed
-    TREATMENT_RECIRC_PAUSE_STATE,           ///< Recirculate paused.  Blood pump off.  Blood lines closed and shunted.  Dialyzer is bypassed
-    TREATMENT_RECIRC_STOP_STATE,            ///< Recirculate stopped.  Blood pump off.  Blood lines open.  Waiting for patient to unshunt and connect and resume treatment
     TREATMENT_DIALYSIS_END_STATE,           ///< Dialysis has ended.  Blood pump slowed.  Dialyzer is bypassed.  Dialysate is recirculated.  User can rinseback
     TREATMENT_END_STATE,                    ///< Treatment has ended.  All pumps off.  Dialyzer is bypassed.  Blood lines are closed.  User to disconnect
     NUM_OF_TREATMENT_STATES                 ///< Number of treatment states (sub-modes)
@@ -277,6 +273,42 @@
 /**@}*/
 
 /**
+ *  @addtogroup Rinseback
+ *  @{
+ */
+
+/// Enumeration of rinseback sub-mode states.
+enum Rinseback_States
+{
+    RINSEBACK_STOP_INIT_STATE = 0,                      ///< Start state (stopped) of the rinseback sub-mode state machine
+    RINSEBACK_RUN_STATE,                                ///< Rinseback running state of the rinseback sub-mode state machine
+    RINSEBACK_PAUSED_STATE,                             ///< Rinseback paused state of the rinseback sub-mode state machine
+    RINSEBACK_STOP_STATE,                               ///< Rinseback stopped (done) state of the rinseback sub-mode state machine
+    RINSEBACK_RUN_ADDITIONAL_STATE,                     ///< Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine
+    NUM_OF_RINSEBACK_STATES                             ///< Number of rinseback sub-mode states
+};
+typedef enum Rinseback_States RINSEBACK_STATE_T;        ///< Type for rinseback states enumeration.
+
+/**@}*/
+
+/**
+ *  @addtogroup TreatmentRecirc
+ *  @{
+ */
+
+/// Enumeration of treatment re-circulation sub-mode states.
+enum Treatment_Recirc_States
+{
+    TREATMENT_RECIRC_RECIRC_STATE = 0,                  ///< Re-circulate state of the treatment re-circulate sub-mode state machine
+    TREATMENT_RECIRC_UF_STATE,                          ///< Stopped state of the treatment re-circulate sub-mode state machine
+    NUM_OF_TREATMENT_RECIRC_STATES                      ///< Number of treatment re-circulate sub-mode states
+};
+/// Type for treatment re-circulation states enumeration.
+typedef enum Treatment_Recirc_States TREATMENT_RECIRC_STATE_T;
+
+/**@}*/
+
+/**
  *  @addtogroup HDTreatmentParamsMode
  *  @{
  */
Index: MsgDefs.h
===================================================================
diff -u -r83013a57b0b7a91f650a889fb096b4141cd26f00 -r74bc32e13ed69a4e5a7217f1f5098bc17ff60466
--- MsgDefs.h	(.../MsgDefs.h)	(revision 83013a57b0b7a91f650a889fb096b4141cd26f00)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 74bc32e13ed69a4e5a7217f1f5098bc17ff60466)
@@ -110,6 +110,10 @@
     MSG_ID_UI_SET_UF_VOLUME_PARAMETER = 0x4F,                           ///< UI request to validate new ultrafiltration volume treatment parameter
     MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE = 0x50,                  ///< HD response to new treatment parameters set
     MSG_ID_DG_COMMAND_RESPONSE = 0x51,                                  ///< DG response to command from HD
+    MSG_ID_DG_COMMAND_RESPONSE = 0x52,                                  ///< UI rinseback request
+    MSG_ID_DG_COMMAND_RESPONSE = 0x53,                                  ///< HD rinseback request response
+    MSG_ID_DG_COMMAND_RESPONSE = 0x54,                                  ///< UI re-circ request
+    MSG_ID_DG_COMMAND_RESPONSE = 0x55,                                  ///< HD re-circ request response
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing