Index: firmware/App/Monitors/Bubbles.c
===================================================================
diff -u -r0c8ae7b952186d912c77d8c2cfb7dad809fa5225 -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a
--- firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 0c8ae7b952186d912c77d8c2cfb7dad809fa5225)
+++ firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a)
@@ -330,33 +330,8 @@
  *************************************************************************/
 BOOL testBubblesDataPublishIntervalOverride( MESSAGE_T *message )
 {
-    BOOL                    result = FALSE;
-    TEST_OVERRIDE_PAYLOAD_T override;
-    OVERRIDE_TYPE_T         ovType = getOverridePayloadFromMessage( message, &override );
+    BOOL result = u32BroadcastIntervalOverride( message, &bubblesDataPublishInterval, TASK_PRIORITY_INTERVAL );
 
-    // Verify tester has logged in with TD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        if ( OVERRIDE_OVERRIDE == ovType )
-        {
-            U32 value = override.state.u32;
-            U32 intvl = value / TASK_PRIORITY_INTERVAL;
-
-            if ( intvl > 0 )
-            {
-                result = TRUE;
-                bubblesDataPublishInterval.ovData = intvl;
-                bubblesDataPublishInterval.override = OVERRIDE_KEY;
-            }
-        }
-        else
-        {
-            result = TRUE;
-            bubblesDataPublishInterval.override = OVERRIDE_RESET;
-            bubblesDataPublishInterval.ovData = bubblesDataPublishInterval.ovInitData;
-        }
-    }
-
     return result;
 }