Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r2df3175ad36264bc9deeccdea7b0c99e59127844
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 2df3175ad36264bc9deeccdea7b0c99e59127844)
@@ -199,9 +199,8 @@
     alarmStatus.noResume = FALSE;
     alarmStatus.noRinseback = FALSE;
     alarmStatus.noEndTreatment = FALSE;
-    alarmStatus.noNewTreatment = FALSE;
     alarmStatus.noDialRecirc = FALSE;
-    alarmStatus.usrACKRequired = FALSE;
+    alarmStatus.ok = FALSE;
 
     alarmAudioTestToneRequested = FALSE;
     alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_START;
@@ -489,8 +488,8 @@
 
         if ( ALARM_USER_ACTION_ACK == action )
         {
-            // If user acknowledged top alarm, just clear that alarm
-            if ( TRUE == ALARM_TABLE[ a ].alarmUserAckRequired )
+            // If user acknowledged alarm w/ clear only property, just clear that alarm
+            if ( TRUE == ALARM_TABLE[ a ].alarmClearOnly )
             {
                 clearAlarm( a );
             }
@@ -646,19 +645,6 @@
 
 /*********************************************************************//**
  * @brief
-* The getNoNewTreatmentStatus function gets the persistent no new
-* treatment alarm status flag.
-* @details Inputs: alarmStatus.noNewTreatment
-* @details Outputs: none
-* @return TRUE if no new treatment allowed, otherwise FALSE
-*************************************************************************/
-BOOL getNoNewTreatmentStatus( void )
-{
-    return alarmStatus.noNewTreatment;
-}
-
-/*********************************************************************//**
- * @brief
 * The handleActiveAlarmListRequest function processed the active alarms list
 * request from UI.
 * @details Inputs: alarmIsActive[]
@@ -1038,7 +1024,6 @@
     BOOL noResume = FALSE;
     BOOL noRinseback = FALSE;
     BOOL noEndTreatment = FALSE;
-    BOOL noNewTreatment = FALSE;
     BOOL usrAckReq = FALSE;
     BOOL noMinimize = TRUE;
     ALARM_ID_T   a;
@@ -1051,7 +1036,6 @@
             systemFault = ( TRUE == ALARM_TABLE[ a ].alarmIsFault ? TRUE : systemFault );
             stop = ( TRUE == ALARM_TABLE[ a ].alarmStops ? TRUE : stop );
             noClear = ( TRUE == ALARM_TABLE[ a ].alarmNoClear ? TRUE : noClear );
-            noNewTreatment = ( TRUE == ALARM_TABLE[ a ].alarmNoNewTreatment ? TRUE : noNewTreatment );
             // Set user alarm recovery actions allowed flags
             if ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ] )
             {
@@ -1087,8 +1071,8 @@
         noRinseback = TRUE;
     }
 
-    // If top alarm requires user ack or no other user options enabled for recoverable alarm and condition cleared, set user ack flag and block other flags
-    if ( ( TRUE == ALARM_TABLE[ alarmStatus.alarmTop ].alarmUserAckRequired ) ||
+    // If top alarm has clear only property or no other user options enabled for recoverable alarm and condition cleared, set user ack flag and block other flags
+    if ( ( TRUE == ALARM_TABLE[ alarmStatus.alarmTop ].alarmClearOnly ) ||
          ( ( FALSE == alarmStatus.noClear ) && ( noResume ) && ( noRinseback ) && ( noEndTreatment ) &&
            ( FALSE == alarmStatus.topAlarmConditionDetected ) ) )
     {
@@ -1111,8 +1095,7 @@
     alarmStatus.noResume = noResume;
     alarmStatus.noRinseback = noRinseback;
     alarmStatus.noEndTreatment = noEndTreatment;
-    alarmStatus.noNewTreatment |= noNewTreatment;
-    alarmStatus.usrACKRequired = usrAckReq;
+    alarmStatus.ok = usrAckReq;
     alarmStatus.noMinimize = noMinimize;
 }