Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r0fce4283f8f28da957f9e82ec121efbc6ee55241 -r7325348a8b5fce9101d0f68d89c791d48e1a3575
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 0fce4283f8f28da957f9e82ec121efbc6ee55241)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 7325348a8b5fce9101d0f68d89c791d48e1a3575)
@@ -43,10 +43,10 @@
 typedef enum Alarm_Actions
 {
     ALARM_ACTION_STOP = 0,                                          ///< Alarm state requests HD in safe state (pumps stopped, heater off, valves in safe state)
-    ALARM_ACTION_BYPASS_DIALYZER,                                   ///< Alarm state requests dialysate re-circ while bypassing dialyzer
     ALARM_ACTION_RESUME,                                            ///< User selected resume from alarm recovery options
     ALARM_ACTION_RINSEBACK,                                         ///< User selected rinseback from alarm recovery options
     ALARM_ACTION_END_TREATMENT,                                     ///< User selected end treatment from alarm recovery options
+    ALARM_ACTION_ACK,                                               ///< User selected Ack from alarm recovery options
     NUMBER_OF_ALARM_ACTIONS                                         ///< Number of alarm actions
 } ALARM_ACTION_T;
 
@@ -80,7 +80,7 @@
     BOOL                noRinseback;                                ///< rinseback may not be initiated at this time
     BOOL                noEndTreatment;                             ///< ending the treatment is not an option at this time
     BOOL                noNewTreatment;                             ///< no new treatments may be started even if current treatment is ended
-    BOOL                bypassDialyzer;                             ///< the dialyzer should be bypassed at this time
+    BOOL                usrACKRequired;                             ///< the user must acknowledge top alarm
     BOOL                lampOn;                                     ///< the alarm lamp is on
 } COMP_ALARM_STATUS_T;
 
@@ -193,8 +193,8 @@
     SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL,                              // 50
     SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER,
     SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL,
+    SW_FAULT_ID_MODE_TREATMENT_INVALID_ALARM_ACTION,
     SW_FAULT_ID____AVAILABLE_1,
-    SW_FAULT_ID____AVAILABLE_2,
     SW_FAULT_ID_DIALYSIS_INVALID_STATE,                                 // 55
     SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE,
     SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,