Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359 -r7f092a08a3271074a079042d2e8f1c700e9d6bc3
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 7f092a08a3271074a079042d2e8f1c700e9d6bc3)
@@ -7,8 +7,8 @@
 *
 * @file    ConsumableSelfTest.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      25-Feb-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  06-Mar-2021
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359 -r7f092a08a3271074a079042d2e8f1c700e9d6bc3
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7f092a08a3271074a079042d2e8f1c700e9d6bc3)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      02-Mar-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -72,7 +72,6 @@
 /// Multiplier to conver flow (mL/min) into volume (mL) for period of general task interval.
 static const F32 SELF_TEST_FLOW_INTEGRATOR = ( ( 1.0 * TASK_GENERAL_INTERVAL ) / ( SEC_PER_MIN * MS_PER_SECOND ) );
 
-
 // ********** private data **********
 
 static NO_CART_SELF_TESTS_STATE_T currentNoCartSelfTestsState;      ///< Current state of the no cartridge self-tests state machine.
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359 -r7f092a08a3271074a079042d2e8f1c700e9d6bc3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7f092a08a3271074a079042d2e8f1c700e9d6bc3)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Mar-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      11-Mar-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -28,7 +28,6 @@
 #include "Fans.h"
 #include "FPGA.h"
 #include "ModeStandby.h"
-#include "ModeTreatmentParams.h"
 #include "OperationModes.h"
 #include "RTC.h"
 #include "SampleWater.h"
@@ -1819,7 +1818,7 @@
     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.usrACKRequired               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK)      : 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 );