Index: AlarmDefs.h
===================================================================
diff -u -rcf1fed41c558443039d166b55c9e912df4209d9c -r31c9b1fbb30914978d8ee2b398d812d7c970c178
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision cf1fed41c558443039d166b55c9e912df4209d9c)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 31c9b1fbb30914978d8ee2b398d812d7c970c178)
@@ -167,6 +167,7 @@
     ALARM_ID_INSTALL_NEW_CARTRIDGE = 129,                           ///< HD needs new cartridge to be installed
     ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 130,                  ///< HD cartridge installed improperly alarm
     ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE = 131,                  ///< HD rinseback volume check failure
+    ALARM_ID_END_TREATMENT_TIMEOUT_ALARM = 132,                     ///< HD end treatment sub-mode timeout alarm
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -398,6 +399,7 @@
     { ALARM_PRIORITY_LOW,      4,   0,              ALARM_ID_NO_ALARM,                            FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE }, // ALARM_ID_INSTALL_NEW_CARTRIDGE
     { ALARM_PRIORITY_LOW,      4,   0,              ALARM_ID_NO_ALARM,                            FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE }, // ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY
     { ALARM_PRIORITY_MEDIUM,   3,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_RINSEBACK_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_END_TREATMENT_TIMEOUT_ALARM
     // Priority              Rank  Escalate In      Escalate To                                   Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  UsrAck
 };
 
Index: HDDefs.h
===================================================================
diff -u -re685556de06610793c3f4ab94bd1f52135f07fd2 -r31c9b1fbb30914978d8ee2b398d812d7c970c178
--- HDDefs.h	(.../HDDefs.h)	(revision e685556de06610793c3f4ab94bd1f52135f07fd2)
+++ HDDefs.h	(.../HDDefs.h)	(revision 31c9b1fbb30914978d8ee2b398d812d7c970c178)
@@ -382,7 +382,35 @@
 
 /**@}*/
 
+/**@}*/
+
 /**
+ *  @addtogroup TreatmentEnd
+ *  @{
+ */
+
+/// Enumeration of treatment end sub-mode states.
+enum Treatment_End_States
+{
+    TREATMENT_END_WAIT_FOR_RINSEBACK_STATE = 0,                         ///< Wait for rinseback state of the treatment end sub-mode state machine
+    TREATMENT_END_PAUSED_STATE,                                         ///< Paused state of the treatment end sub-mode state machine
+    NUM_OF_TREATMENT_END_STATES                                         ///< Number of treatment end sub-mode states
+};
+/// Type for treatment end states enumeration.
+typedef enum Treatment_End_States TREATMENT_END_STATE_T;
+
+/// Enumeration of user actions that may be requested from treatment end sub-mode.
+enum Requested_Treatment_End_User_Actions
+{
+    REQUESTED_USER_ACTION_TX_END_RINSEBACK_START = 0,                   ///< User requests to initiate final rinseback
+    NUM_OF_REQUESTED_TX_END_USER_ACTIONS                                ///< Number of requested treatment end user actions
+};
+/// Type for requested user actions enumeration.
+typedef enum Requested_Treatment_End_User_Actions REQUESTED_TREATMENT_END_USER_ACTIONS_T;
+
+/**@}*/
+
+/**
  *  @addtogroup HDTreatmentParamsMode
  *  @{
  */
@@ -420,8 +448,9 @@
 /// Enumeration of dialyzer types.
 enum Dialyzer_Types
 {
-    DIALYZER_TYPE_NIPRO_ELISIO_H_17 = 0,                                ///< Nipro Elisio H17 dialyzer
-    DIALYZER_TYPE_NIPRO_ELISIO_H_19,                                    ///< Nipro Elisio H19 dialyzer
+    DIALYZER_TYPE_BBRAUN_PRO_13H = 0,                                   ///< BBraun Diacap Pro 13H
+    DIALYZER_TYPE_BBRAUN_PRO_16H,                                       ///< BBraun Diacap Pro 16H
+    DIALYZER_TYPE_BBRAUN_PRO_19H,                                       ///< BBraun Diacap Pro 19H
     DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F160NRE,                           ///< Fresenius Optiflux F160NRe
     DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F180NRE,                           ///< Fresenius Optiflux F180NRe
     NUM_OF_DIALYZER_TYPES                                               ///< Number of dialyzer types