Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -re2e51b0219db0132cebb6f65f3dbd803e1f01e30 -re7fe0454b5b2d39009dc784dc8c156856df8bc86
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision e2e51b0219db0132cebb6f65f3dbd803e1f01e30)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision e7fe0454b5b2d39009dc784dc8c156856df8bc86)
@@ -131,29 +131,8 @@
  *************************************************************************/
 BOOL testConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message )
 {
-    BOOL                    result = FALSE;
-    TEST_OVERRIDE_PAYLOAD_T override;
-    OVERRIDE_TYPE_T         ovType = getOverridePayloadFromMessage( message, &override );
+    BOOL result = u32BroadcastIntervalOverride( message, &conductivityDataPublishInterval, TASK_PRIORITY_INTERVAL );
 
-    // Verify tester has logged in with DD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        if ( OVERRIDE_OVERRIDE == ovType )
-        {
-            U32 intvl = override.state.u32 / TASK_PRIORITY_INTERVAL;
-
-            conductivityDataPublishInterval.ovData      = intvl;
-            conductivityDataPublishInterval.override    = OVERRIDE_KEY;
-        }
-        else
-        {
-            conductivityDataPublishInterval.override    = OVERRIDE_RESET;
-            conductivityDataPublishInterval.ovData      = conductivityDataPublishInterval.ovInitData;
-        }
-
-        result = TRUE;
-    }
-
     return result;
 }