Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r4bacd2a66a76a9913852c10b99b8c341826010e8
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4bacd2a66a76a9913852c10b99b8c341826010e8)
@@ -279,10 +279,10 @@
     BOOL result = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NONE;
 
-    if ( TRUE == getNoNewTreatmentStatus() )
-    {
-        rejReason = REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED;
-    }
+//    if ( TRUE == getNoNewTreatmentStatus() )
+//    {
+//        rejReason = REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED;
+//    }
 
     if ( ( MODE_STAN != getCurrentOperationMode() ) || ( STANDBY_WAIT_FOR_TREATMENT_STATE != currentStandbyState ) )
     {
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e -r4bacd2a66a76a9913852c10b99b8c341826010e8
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4bacd2a66a76a9913852c10b99b8c341826010e8)
@@ -1055,7 +1055,7 @@
             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 );
+            //noNewTreatment = ( TRUE == ALARM_TABLE[ a ].alarmNoNewTreatment ? TRUE : noNewTreatment );
             // Set user alarm recovery actions allowed flags
             if ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ] )
             {
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e -r4bacd2a66a76a9913852c10b99b8c341826010e8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4bacd2a66a76a9913852c10b99b8c341826010e8)
@@ -1803,8 +1803,8 @@
     payload.alarmsFlags |= ( almStatus.noResume                     ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RESUME)          : 0 );
     payload.alarmsFlags |= ( almStatus.noRinseback                  ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK)       : 0 );
     payload.alarmsFlags |= ( almStatus.noEndTreatment               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT)   : 0 );
-    payload.alarmsFlags |= ( almStatus.noNewTreatment               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT)   : 0 );
-    payload.alarmsFlags |= ( almStatus.ok                           ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK)      : 0 );
+//    payload.alarmsFlags |= ( almStatus.noNewTreatment               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT)   : 0 );
+    payload.alarmsFlags |= ( almStatus.ok                           ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY)      : 0 );
     payload.alarmsFlags |= ( almStatus.alarmsToEscalate             ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE) : 0 );
     payload.alarmsFlags |= ( almStatus.alarmsSilenced               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED)    : 0 );
     payload.alarmsFlags |= ( almStatus.lampOn                       ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON)            : 0 );