Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r2b6681439433ddfa7857affbaf1a5f135d90c6aa -r65e9ace2ff9f38eaba47c097377430c6c301d359
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 2b6681439433ddfa7857affbaf1a5f135d90c6aa)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 65e9ace2ff9f38eaba47c097377430c6c301d359)
@@ -432,4 +432,56 @@
     }
 }
 
+
+/*************************************************************************
+ *                       TEST SUPPORT FUNCTIONS
+ *************************************************************************/
+
+
+/*********************************************************************//**
+ * @brief
+ * The testSetDrainModeDataPublishIntervalOverride function overrides the
+ * drain mode data publish interval.
+ * @details Inputs: drainModeDataPublishInterval
+ * @details Outputs: drainModeDataPublishInterval
+ * @param: value override drain mode data publish interval with (in ms)
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testSetDrainModeDataPublishIntervalOverride( U32 value )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        U32 intvl                             = value / TASK_GENERAL_INTERVAL;
+        drainModeDataPublishInterval.ovData   = intvl;
+        drainModeDataPublishInterval.override = OVERRIDE_KEY;
+        result                                = TRUE;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetDrainModeDataPublishIntervalOverride function resets the
+ * override of the drain mode data publish interval.
+ * @details Inputs: drainModeDataPublishInterval
+ * @details Outputs: drainModeDataPublishInterval
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetDrainModeDataPublishIntervalOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        drainModeDataPublishInterval.override = OVERRIDE_RESET;
+        drainModeDataPublishInterval.ovData   = drainModeDataPublishInterval.ovInitData;
+        result                                = TRUE;
+    }
+
+    return result;
+}
+
 /**@}*/
Index: firmware/App/Modes/ModeDrain.h
===================================================================
diff -u -r2b6681439433ddfa7857affbaf1a5f135d90c6aa -r65e9ace2ff9f38eaba47c097377430c6c301d359
--- firmware/App/Modes/ModeDrain.h	(.../ModeDrain.h)	(revision 2b6681439433ddfa7857affbaf1a5f135d90c6aa)
+++ firmware/App/Modes/ModeDrain.h	(.../ModeDrain.h)	(revision 65e9ace2ff9f38eaba47c097377430c6c301d359)
@@ -48,6 +48,9 @@
 DG_DRAIN_STATE_T getCurrentDrainState( void );  // get the current state of the drain mode.
 void signalDrainModeRinseConcentrateLines( BOOL rinse );    // Signal drain mode to rinse concentrate lines.
 
+BOOL testSetDrainModeDataPublishIntervalOverride( U32 value );
+BOOL testResetDrainModeDataPublishIntervalOverride( void );
+
 /**@}*/
 
 #endif
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r65e9ace2ff9f38eaba47c097377430c6c301d359
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 65e9ace2ff9f38eaba47c097377430c6c301d359)
@@ -1356,6 +1356,10 @@
                 handleTestDGSetRecoverFromFaultModeSignal( message );
                 break;
 
+            case MSG_ID_DG_DRAIN_MODE_BROADCAST_INTERVAL_OVERRIDE:
+                handleTestDGDrainModeBroadcastOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;
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 );
+}
+
 /**@}*/