Index: dialin/common/alarm_defs.py
===================================================================
diff -u -ra7253ef8e885d542d22539cd1e4c608f7ce63eb5 -redba7636b264ec363ed507b5cc771add6af484a4
--- dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision a7253ef8e885d542d22539cd1e4c608f7ce63eb5)
+++ dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision edba7636b264ec363ed507b5cc771add6af484a4)
@@ -293,7 +293,7 @@
     ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED = 270
     ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED = 271
     ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE = 272
-    ALARM_ID_AVAILABLE_10 = 273
+    ALARM_ID_AVAILABLE_30 = 273
     ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE = 274
     ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE = 275
     ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE = 276
Index: dialin/common/hd_defs.py
===================================================================
diff -u -ra7253ef8e885d542d22539cd1e4c608f7ce63eb5 -redba7636b264ec363ed507b5cc771add6af484a4
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision a7253ef8e885d542d22539cd1e4c608f7ce63eb5)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision edba7636b264ec363ed507b5cc771add6af484a4)
@@ -301,6 +301,8 @@
     TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE              =  1    # Re-circulate Dialysate only state of the treatment re-circulate sub-mode state machine
     TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE                  =  2    # Re-circulate Blood only state of the treatment re-circulate sub-mode state machine
     TREATMENT_STOP_NO_RECIRC_STATE                          =  3    # No re-circulation state of the treatment stop sub-mode state machine
+    TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE               =  4    # Treatment stop recover blood detect state
+    TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE               =  5    # Treatment stop deliver saline bolus state
     NUM_OF_TREATMENT_STOP_STATES                            =  4    # Number of treatment stop sub-mode states
 
 @unique
@@ -391,7 +393,6 @@
     SALINE_BOLUS_STATE_IDLE                                 =  0    # No saline bolus delivery is in progress
     SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP                  =  1    # Wait for pumps to stop before starting bolus
     SALINE_BOLUS_STATE_IN_PROGRESS                          =  2    # A saline bolus delivery is in progress
-    SALINE_BOLUS_STATE_MAX_DELIVERED                        =  3    # Maximum saline bolus volume reached - no more saline bolus deliveries allowed
     NUM_OF_SALINE_BOLUS_STATES                              =  4    # Number of saline bolus states
 
 @unique
Index: dialin/common/msg_defs.py
===================================================================
diff -u -ra7253ef8e885d542d22539cd1e4c608f7ce63eb5 -redba7636b264ec363ed507b5cc771add6af484a4
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision a7253ef8e885d542d22539cd1e4c608f7ce63eb5)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision edba7636b264ec363ed507b5cc771add6af484a4)
@@ -127,13 +127,13 @@
     REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION = 18
     REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED = 19
     REQUEST_REJECT_REASON_AVAILABLE_2 = 20
-    REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 21
+    REQUEST_REJECT_REASON_AVAILABLE_3 = 21
     REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 22
     REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE = 23
     REQUEST_REJECT_REASON_ALARM_IS_ACTIVE = 24
     REQUEST_REJECT_REASON_INVALID_COMMAND = 25
     REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED = 26
-    REQUEST_REJECT_REASON_ADDL_RINSEBACK_MAX_VOLUME_REACHED = 27
+    REQUEST_REJECT_REASON_AVAILABLE_4 = 27
     REQUEST_REJECT_REASON_DIALYZER_NOT_INVERTED = 28
     REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM = 29
     REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE = 30