Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rda7e8c1b71db9273f83e9d0ba7d20e74e758a8ad -r4bae2d153f4242a52c8602df3e5161d6f1f122ef
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision da7e8c1b71db9273f83e9d0ba7d20e74e758a8ad)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4bae2d153f4242a52c8602df3e5161d6f1f122ef)
@@ -999,7 +999,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -1147,7 +1147,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -1185,7 +1185,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -1206,7 +1206,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -1242,7 +1242,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -1263,7 +1263,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -1299,7 +1299,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -1335,7 +1335,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -1370,7 +1370,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2113,7 +2113,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2141,7 +2141,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2226,7 +2226,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2276,7 +2276,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2682,7 +2682,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2707,7 +2707,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2731,7 +2731,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2760,7 +2760,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2785,7 +2785,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2810,7 +2810,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2835,7 +2835,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2867,7 +2867,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2926,7 +2926,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -2982,7 +2982,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -3039,7 +3039,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
     }
 }
 
@@ -3272,7 +3272,6 @@
  *************************************************************************/
 void handleUIConfirmationResponse( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
     U08* payloadPtr = message->payload;
 
     if ( message->hdr.payloadLen == 2 * sizeof(U32) )
@@ -3291,7 +3290,7 @@
         }
     }
 
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
 }
 
 /*********************************************************************//**
@@ -7520,11 +7519,12 @@
  * the blood leak embedded mode command response.
  * @details Inputs: none
  * @details Outputs: blood leak embedded mode command response msg constructed and queued
+ * @param cmd: the command its response is being sent
  * @param responseLen: the length of the buffer
  * @param response: pointer to the response buffer
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response )
+BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -7533,8 +7533,10 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID      = MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE;
-    msg.hdr.payloadLen = sizeof( U32 ) + responseLen;
+    msg.hdr.payloadLen = sizeof( U08 ) + sizeof( U32 ) + responseLen;
 
+    memcpy( payloadPtr, &cmd, sizeof( U08 ) );
+    payloadPtr += sizeof( U08 );
     memcpy( payloadPtr, &responseLen, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, response, responseLen );