Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r7d7aa4ab03e6277a5645c5f0cabc815070ab8118 -r1b95ae077de1d01a314be8cc011662ab508fba10
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7d7aa4ab03e6277a5645c5f0cabc815070ab8118)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1b95ae077de1d01a314be8cc011662ab508fba10)
@@ -2317,14 +2317,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestDrainPumpRPMOverrideRequest function handles a request to
- * override the drain pump speed set point (in RPM).
+ * The handleTestSetDrainPumpRPM function handles a request to set the drain
+ * pump speed set point (in RPM).
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message )
+void handleTestSetDrainPumpRPM( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
@@ -3739,6 +3739,38 @@
 
 /*********************************************************************//**
 * @brief
+* The handleSetDrainPumpMeasuredRPMOverrideRequest function handles a request
+* to override the drain pump measured RPM.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetDrainPumpMeasuredRPMOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetDrainPumpMeasuredRPMOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
 * The handleStartStopDGChemicalDisinfect function handles a request to start
 * or stop DG chemical disinfect mode.
 * @details Inputs: none