Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rc1e2dfcd544f59788ad1a58e1e8339a475ba4266 -r4e9b962e7cb3c0b477462756a32214118b10fc16
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c1e2dfcd544f59788ad1a58e1e8339a475ba4266)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4e9b962e7cb3c0b477462756a32214118b10fc16)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      04-May-2023
+* @date    (last)      01-Jun-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1863,6 +1863,7 @@
     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 );
+    payload.alarmsFlags |= ( almStatus.noReTrigger                  ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RETRIGGER)       : 0 );
     payload.alarmsFlags |= ( almStatus.noBloodRecirc                ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_BLOOD_RECIRC)       : 0 );
     payload.alarmsFlags |= ( almStatus.noDialRecirc                 ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC)   : 0 );
     payload.alarmsFlags |= ( almStatus.noMinimize                   ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE)        : 0 );
@@ -3362,16 +3363,16 @@
  * The sendConfirmationRequest function sends a confirmation request to UI
  * @details Inputs: none
  * @details Outputs: none
- * @param request_id ID of confirmation being requested
- * @param request_type Type of confirmation being requested
- * @param reject_reason Reason Reason for reject if type is reject
+ * @param requestID ID of confirmation being requested
+ * @param requestType Type of confirmation being requested
+ * @param rejectReason Reason Reason for reject if type is reject
  * @return none
  *************************************************************************/
-void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason )
+void sendConfirmationRequest( GENERIC_CONFIRM_ID_T requestID, GENERIC_CONFIRM_COMMAND_T requestType, U32 rejectReason )
 {
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
-    U32 temp_request = request_id;
+    U32 temp_request = requestID;
 
     // Create a message record
     blankMessage( &msg );
@@ -3381,13 +3382,13 @@
 
     memcpy( payloadPtr, &temp_request, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    temp_request = request_type;
+    temp_request = requestType;
     memcpy( payloadPtr, &temp_request, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &reject_reason, sizeof( U32 ) );
+    memcpy( payloadPtr, &rejectReason, sizeof( U32 ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
+    serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
 }
 
 /*********************************************************************//**
@@ -3437,6 +3438,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The setTesterStatusToLoggedOut function sets the status of the tester to
+ * logged out.
+ * @details Inputs: none
+ * @details Outputs: testerLoggedIn
+ * @return none
+ *************************************************************************/
+void setTesterStatusToLoggedOut( void )
+{
+    testerLoggedIn = FALSE;
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendTestAckResponseMsg function constructs a simple response
  * message for a handled test message and queues it for transmit on the
  * appropriate UART channel.
@@ -7138,6 +7152,7 @@
     return result;
 }
 
+#ifndef _RELEASE_
 /*********************************************************************//**
 * @brief
 * The handleGetHDSoftwareConfigRecord function handles a request to get the HD
@@ -7199,6 +7214,7 @@
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
+#endif
 
 /*********************************************************************//**
  * @brief