Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8948f660dc5440db9e6cb7705457ed71d2b13248 -r3db5538afb80bc12822304d698343e0325fa708e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8948f660dc5440db9e6cb7705457ed71d2b13248)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3db5538afb80bc12822304d698343e0325fa708e)
@@ -153,7 +153,9 @@
             data[ msgSize++ ] = 0;
         }
 
+#ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACK_ERRORS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
         {
             // If ACK required, add to pending ACK list
             if ( TRUE == ackReq )
@@ -5830,6 +5832,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
+#ifndef _RELEASE_
     // Verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
@@ -5843,6 +5846,7 @@
             result = testResetValvesCurrentOverride( payload.index );
         }
     }
+#endif
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
@@ -5895,6 +5899,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
+#ifndef _RELEASE_
     // Verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
@@ -5908,6 +5913,7 @@
             result = testResetValvesPositionCountOverride( payload.index );
         }
     }
+#endif
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );