Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -r031a5ae459c0b73d8b95e6cb8a484309846c1b46
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 031a5ae459c0b73d8b95e6cb8a484309846c1b46)
@@ -7,8 +7,8 @@
 *
 * @file    AlarmMgmt.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  07-Nov-2019
@@ -206,7 +206,7 @@
     alarmStatus.noEndTreatment = FALSE;
     alarmStatus.noNewTreatment = FALSE;
     alarmStatus.noDialRecirc = FALSE;
-    alarmStatus.usrACKRequired = FALSE;
+    alarmStatus.ok = FALSE;
 
     alarmAudioTestToneRequested = FALSE;
     alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_START;
@@ -494,8 +494,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 );
             }
@@ -1055,7 +1055,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 ] )
             {
@@ -1091,8 +1090,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 ) ) )
     {
@@ -1116,7 +1115,7 @@
     alarmStatus.noRinseback = noRinseback;
     alarmStatus.noEndTreatment = noEndTreatment;
     alarmStatus.noNewTreatment |= noNewTreatment;
-    alarmStatus.usrACKRequired = usrAckReq;
+    alarmStatus.ok = usrAckReq;
     alarmStatus.noMinimize = noMinimize;
 }