Index: AlarmDefs.h
===================================================================
diff -u -r9e64bac640514113f61cec766b08452d7b39d753 -rc17457e75bce15199acd967951319c7aedd177a1
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 9e64bac640514113f61cec766b08452d7b39d753)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision c17457e75bce15199acd967951319c7aedd177a1)
@@ -328,7 +328,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 -r4d6e04d701cf2f15c93590d1fc606a91321c4b65 -rc17457e75bce15199acd967951319c7aedd177a1
--- HDDefs.h	(.../HDDefs.h)	(revision 4d6e04d701cf2f15c93590d1fc606a91321c4b65)
+++ HDDefs.h	(.../HDDefs.h)	(revision c17457e75bce15199acd967951319c7aedd177a1)
@@ -177,11 +177,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)
@@ -279,6 +275,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
  *  @{
  */