Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1c43de0034f7347a38ca8d91acb5753a344a7133 -ra97fcffbe7b7b2d9543358ac06868829d41cf173
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1c43de0034f7347a38ca8d91acb5753a344a7133)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a97fcffbe7b7b2d9543358ac06868829d41cf173)
@@ -5641,4 +5641,36 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestValvesPositionCountOverrideRequest function handles a
+ * request to override HD valves' position in counts.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestValvesPositionCountOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetValvesPositionCountOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetValvesPositionCountOverride( payload.index );
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/