Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r86eff2c63b93ec1b8de2dd95bdcadf55f7e1ad87 -r28cd9da453de6282baea3113cf9f787810aae1e5
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 86eff2c63b93ec1b8de2dd95bdcadf55f7e1ad87)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 28cd9da453de6282baea3113cf9f787810aae1e5)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Darren Cox
-* @date    (last)      23-Mar-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      25-May-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -39,6 +39,7 @@
 #include "TreatmentRecirc.h"
 #include "TreatmentStop.h"
 #include "Utilities.h"
+#include "Valves.h"
 #include "WatchdogMgmt.h"
 #include "HDDefs.h"
 
@@ -4759,7 +4760,6 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-#ifdef DEBUG_ENABLED
 /*********************************************************************//**
  * @brief
  * The handleSetHDValvePWMOverrideRequest function handles a request to
@@ -4791,7 +4791,6 @@
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
-#endif
 
 /*********************************************************************//**
  * @brief
@@ -7255,11 +7254,8 @@
     if ( sizeof( U08 ) + sizeof( U16 ) == message->hdr.payloadLen )
     {
         memcpy( &command, payloadPtr, sizeof( U08 ) );
-
         payloadPtr += sizeof( U08 );
-
         memcpy( &commandPayload, payloadPtr, sizeof( U16 ) );
-
         result = testSetBloodLeakEmbeddedModeCommand( command, commandPayload );
     }