Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5fc30ce9beec03fad785ce9f9e6602d4b49079fa -r3a2b4f4cfc9681ea855365ad7bc00bea47e2a3e3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5fc30ce9beec03fad785ce9f9e6602d4b49079fa)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3a2b4f4cfc9681ea855365ad7bc00bea47e2a3e3)
@@ -30,6 +30,7 @@
 #include "Heaters.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeChemicalDisinfectFlush.h"
+#include "ModeDrain.h"
 #include "ModeFill.h"
 #include "ModeFlush.h"
 #include "ModeGenIdle.h"
@@ -4892,4 +4893,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 );
+}
+
 /**@}*/