Index: TDDefs.h
===================================================================
diff -u -rcb36235b4b58396a6bd8e51bf5c65475a4fd50c3 -r62ce72c8cb4d90f4a0a532123b4a8f98bbca3c8d
--- TDDefs.h	(.../TDDefs.h)	(revision cb36235b4b58396a6bd8e51bf5c65475a4fd50c3)
+++ TDDefs.h	(.../TDDefs.h)	(revision 62ce72c8cb4d90f4a0a532123b4a8f98bbca3c8d)
@@ -537,7 +537,6 @@
     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
-    RINSEBACK_RECONNECT_PATIENT_STATE,                                  ///< Rinseback patient reconnect 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.
@@ -550,11 +549,9 @@
     REQUESTED_USER_ACTION_RINSEBACK_DECREASE_RATE = 2,                  ///< User requests decrease in rinseback flow rate
     REQUESTED_USER_ACTION_RINSEBACK_PAUSE = 3,                          ///< User requests to pause rinseback operation
     REQUESTED_USER_ACTION_RINSEBACK_RESUME = 4,                         ///< User requests to resume rinseback operation
-    REQUESTED_USER_ACTION_RINSEBACK_END = 5,                            ///< User requests to end the rinseback operation
-    REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL = 6,                     ///< User requests an additional 10 mL of rinseback volume
-    REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_DISCONNECT = 7,             ///< User confirms patient disconnected, saline bag clamped, re-connected to VBA, un-clamped, and lines shunted to start re-circulation
-    REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT = 8,                  ///< User requests to end treatment
-    REQUESTED_USER_ACTION_RINSEBACK_BACK_TO_TREATMENT = 9,              ///< User requests to return to treatment
+    REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL = 5,                     ///< User requests an additional 10 mL of rinseback volume
+    REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_RECIRCULATE = 6,            ///< User requests to recirculate
+    REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT = 7,                  ///< User requests to end treatment
     NUM_OF_REQUESTED_RINSEBACK_USER_ACTIONS                             ///< Number of requested rinseback user actions
 };
 /// Type for requested user actions enumeration.
@@ -691,6 +688,7 @@
     TREATMENT_PARAM_HEART_RATE_LOW_ALARM_LIMIT,                         ///< Heart rate low alarm limit (BPM)
     TREATMENT_PARAM_HEART_RATE_HIGH_ALARM_LIMIT,                        ///< Heart rate high alarm limit (BPM)
     TREATMENT_PARAM_PRES_ALARM_PERSISTENCE,                             ///< Pressure alarms persistence (seconds)
+    TREATMENT_PARAM_TEMPORARY_BREAK_RECIRC_TIMEOUT,                     ///< Re-circulation timeout (minutes)
     NUM_OF_SYS_CONFIG_TREATMENT_PARAMS                                  ///< Total number of treatment parameters
 };
 typedef enum System_Config_Treatment_Params SYS_CONFIG_TREATMENT_PARAM_T;          ///< Type for system configured treatment parameters enumeration
@@ -853,15 +851,10 @@
 enum Generic_Confirm_Id
 {
     GENERIC_CONFIRM_ID_NONE = 0,                                        ///< Generic Confirm None
-    GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH,                       ///< Water flush stop user confirmation
-    GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT,                             ///< Heat disinfect stop user confirmation
-    GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL,                         ///< Chemical disinfect stop user confirmation
-    GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH,                   ///< Chemical disinfect flush stop user confirmation
-    GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL,           ///< Chemical disinfect sample flush pass/fail
+    GENERIC_CONFIRM_ID_SHUT_DOWN,                                       ///< Shutdown user confirmation
     GENERIC_CONFIRM_ID_TREATMENT_END,                                   ///< End treatment user confirmation
-    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_RINSEBACK,                                       ///< Rinseback user confirmation
+    GENERIC_CONFIRM_ID_TEMPORARY_BREAK,                                 ///< Temporary break user confirmation
     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