Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8912f5ad5d579105c721ce283c9deaa517eec7e1 -r65e9ace2ff9f38eaba47c097377430c6c301d359
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8912f5ad5d579105c721ce283c9deaa517eec7e1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 65e9ace2ff9f38eaba47c097377430c6c301d359)
@@ -4885,4 +4885,36 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestDGDrainModeBroadcastOverrideRequest function handles a request
+ * to override the drain mode state publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDGDrainModeBroadcastOverrideRequest( 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 = testSetDrainModeDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetDrainModeDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/