Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -re228885d4b066320c69bbec2553b5e7fc62ec2cb -re2e51b0219db0132cebb6f65f3dbd803e1f01e30
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision e228885d4b066320c69bbec2553b5e7fc62ec2cb)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision e2e51b0219db0132cebb6f65f3dbd803e1f01e30)
@@ -32,6 +32,7 @@
 // ********** private definitions **********
 
 #define COND_SENSOR_REPORT_PERIOD                       ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )      ///< Broadcast conductivity values message every second.
+#define DATA_PUBLISH_COUNTER_START_COUNT                40                                              ///< Data publish counter start count.
 
 // ********** private data **********
 
@@ -52,16 +53,18 @@
  *************************************************************************/
 void initConductivity( void )
 {
+    conductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+
     initConductivitySensors();
 }
 
 /*********************************************************************//**
  * @brief
- * The execConductivitySensors function gets conductivity sensors' latest
- * readings from FPGA and advertises them over CAN.
+ * The execConductivity function gets conductivity sensors' latest
+ * readings from FPGA and publishes them over CAN.
  * @details \b Inputs: none
  * @details \b Outputs: Conductivity sensor latest reading is updated and
- * advertised.
+ * published.
  * @return none
  *************************************************************************/
 void execConductivity( void )
@@ -132,23 +135,23 @@
     TEST_OVERRIDE_PAYLOAD_T override;
     OVERRIDE_TYPE_T         ovType = getOverridePayloadFromMessage( message, &override );
 
-    // Verify tester has logged in with TD and override type is valid
+    // 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;
 
-            result = TRUE;
             conductivityDataPublishInterval.ovData      = intvl;
             conductivityDataPublishInterval.override    = OVERRIDE_KEY;
         }
         else
         {
-            result = TRUE;
             conductivityDataPublishInterval.override    = OVERRIDE_RESET;
             conductivityDataPublishInterval.ovData      = conductivityDataPublishInterval.ovInitData;
         }
+
+        result = TRUE;
     }
 
     return result;