Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r31c796166189ce36ecbeca2e20291f9227160e92 -rf47296145b6a0adb78df0e325587629171909fd6
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 31c796166189ce36ecbeca2e20291f9227160e92)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f47296145b6a0adb78df0e325587629171909fd6)
@@ -3,6 +3,7 @@
 
 #include "BoostPump.h"
 #include "Compatible.h"
+#include "Conductivity.h"
 #include "Flow.h"
 #include "Level.h"
 #include "Messaging.h"
@@ -74,7 +75,12 @@
     MSG_ID_RO_LEVEL_OVERRIDE_REQUEST,
     MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
     MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST,
-    MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST
+    MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST
 };
 
 /// Message handling function table
@@ -99,7 +105,12 @@
     &testLevelStateOverride,
     &testFlowSensorDataPublishIntervalOverride,
     &testFlowSensorReadingsOverride,
-    &testFlowSensorTemperatureReadingsOverride
+    &testFlowSensorTemperatureReadingsOverride,
+    &testConductivitySensorDataPublishIntervalOverride,
+    &testConductivitySensorReadingsOverride,
+    &testConductivitySensorTemperatureReadingsOverride,
+    &testConductivitySensorReadCounterOverride,
+    &testConductivitySensorErrorCounterOverride
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))