Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r32509258e83fe7daaa5b3c1fd236d09ff184319c -rd7fddd6292c7a23931cc94cc60b148580e792cf0
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 32509258e83fe7daaa5b3c1fd236d09ff184319c)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision d7fddd6292c7a23931cc94cc60b148580e792cf0)
@@ -979,7 +979,7 @@
 
 /*********************************************************************//**
  * @brief
- * The testResetDrainPumpMeasuredRPMOverride function resets the drain pump
+ * The testResetDrainPumpMeasuredCurrentOverride function resets the drain pump
  * measured current data.
  * @details Inputs: none
  * @details Outputs: drainPumpMeasuredCurrentA
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r61fc45d7a43557312d6abd00a6b01e6823b44f04 -rd7fddd6292c7a23931cc94cc60b148580e792cf0
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 61fc45d7a43557312d6abd00a6b01e6823b44f04)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d7fddd6292c7a23931cc94cc60b148580e792cf0)
@@ -1204,6 +1204,10 @@
                 handleTestTareReservoirRequest( message );
                 break;
 
+            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
+                handleTestDrainPumpMeasuredCurrentOverride( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r61fc45d7a43557312d6abd00a6b01e6823b44f04 -rd7fddd6292c7a23931cc94cc60b148580e792cf0
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 61fc45d7a43557312d6abd00a6b01e6823b44f04)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d7fddd6292c7a23931cc94cc60b148580e792cf0)
@@ -3759,4 +3759,37 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestDrainPumpMeasuredCurrentOverride function handles a request
+ * to override the drain pump measured current
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDrainPumpMeasuredCurrentOverride( 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 = testSetDrainPumpMeasuredCurrentOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetDrainPumpMeasuredCurrentOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+
 /**@}*/
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r61fc45d7a43557312d6abd00a6b01e6823b44f04 -rd7fddd6292c7a23931cc94cc60b148580e792cf0
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 61fc45d7a43557312d6abd00a6b01e6823b44f04)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d7fddd6292c7a23931cc94cc60b148580e792cf0)
@@ -403,6 +403,9 @@
 // MSG_ID_HD_OP_MODE
 BOOL handleSetHDOperationMode( MESSAGE_T *message );
 
+// MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE
+BOOL handleTestDrainPumpMeasuredCurrentOverride( MESSAGE_T *message );
+
 /**@}*/
 
 #endif