Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rccdab403fc0fb315e52857ac7968ab5185aa55b7 -re734f2d5dbdf3fa44a46892d1207e1f0859ed242
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision ccdab403fc0fb315e52857ac7968ab5185aa55b7)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision e734f2d5dbdf3fa44a46892d1207e1f0859ed242)
@@ -30,6 +30,7 @@
 #include "TaskGeneral.h"
 #include "Timers.h"
 #include "Utilities.h"
+#include "Valves.h"
 
 /**
  *  @addtogroup ROPump
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rb80e670a9d724b5c6cdac4d74ce263a49bf6b697 -re734f2d5dbdf3fa44a46892d1207e1f0859ed242
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision b80e670a9d724b5c6cdac4d74ce263a49bf6b697)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision e734f2d5dbdf3fa44a46892d1207e1f0859ed242)
@@ -62,6 +62,7 @@
 static U32 valveStateMismatchTimerCounter;                                                                          ///< Initialize valve state mismatch timer.
 static U32 pendingValveStateChanges[ DD_NUM_OF_VALVES ];                                                            ///< Delayed (pending) valve state changes.
 static U32 pendingValveStateChangeCountDowns[ DD_NUM_OF_VALVES ];                                                   ///< Delayed (pending) valve state change count down timers (in task intervals).
+static RECOVERY_STATE_T recoveryState;                                                                              ///< IOFP valve recovery setting.
 
 static OVERRIDE_U32_T valveStates[ DD_NUM_OF_VALVES ];                                                              ///< Currently commanded valves states.
 static OVERRIDE_U32_T valveSensedStates[ DD_NUM_OF_VALVES ];                                                        ///< Valve sensed states override.
@@ -593,6 +594,18 @@
 
 /*********************************************************************//**
  * @brief
+ * The getRecoveryState function gets the current valve  recovery state.
+ * @details \b Inputs: recoveryState
+ * @details \b Outputs: recoveryState
+ * @return the current valve recovery state.
+ *************************************************************************/
+RECOVERY_STATE_T getRecoveryState( void )
+{
+    return recoveryState;
+}
+
+/*********************************************************************//**
+ * @brief
  * The publishValvesStates function publishes DD valves states at the set interval.
  * @details \b Inputs: valvesStatesPublicationTimerCounter
  * @details \b Outputs: valvesStatesPublicationTimerCounter
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rb80df814f62ba7c437afbc26432c0388b8dbfdc4 -re734f2d5dbdf3fa44a46892d1207e1f0859ed242
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision b80df814f62ba7c437afbc26432c0388b8dbfdc4)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision e734f2d5dbdf3fa44a46892d1207e1f0859ed242)
@@ -129,28 +129,21 @@
     { MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDDPressureSensorDataPublishIntervalOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,                   &testDDPressureSensorFilteredReadingsOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST,                &testDDPressureSensorFilteredTemperatureReadingsOverride },
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testDDConductivitySensorDataPublishIntervalOverride },
     { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFPConductivitySensorDataPublishIntervalOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testConductivitySensorReadingsOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testConductivitySensorTemperatureOverride },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testConductivitySensorReadingsOverride },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testConductivitySensorTemperatureOverride },
     { MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST,                                     &testSetTeenyConductivityModel },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testTeensyConductivitySensorReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testTeensyConductivitySensorTemperatureReadingsOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST,                    &testTeensyConductivitySensorResistanceReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                                      &testTeensyConductivitySensorReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testTeensyConductivitySensorTemperatureReadingsOverride },
     { MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST,                    &testTeensyConductivitySensorResistanceReadingsOverride },
-#else
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testDDConductivitySensorReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testDDConductivitySensorTemperatureReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,                  &testDDConductivitySensorReadCounterOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,                 &testDDConductivitySensorErrorCounterOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testDDConductivitySensorDataPublishIntervalOverride },
-    { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFPConductivitySensorDataPublishIntervalOverride },
-    { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                                      &testFPConductivitySensorReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testFPConductivitySensorTemperatureReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,                           &testFPConductivitySensorReadCounterOverride },
-    { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,                          &testFPConductivitySensorErrorCounterOverride },
-#endif
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_CONDUCTIVITY_READ_COUNTER_OVERRIDE_REQUEST,     &testConductivitySensorConductivityReadCounterOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_CONDUCTIVITY_ERROR_COUNTER_OVERRIDE_REQUEST,    &testConductivitySensorConductivityErrorCounterOverride },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,       &testConductivitySensorConductivityReadCounterOverride },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,      &testConductivitySensorConductivityErrorCounterOverride },
+
     { MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                 &testConcentratePumpDataPublishIntervalOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST,                     &testConcentratePumpTargetSpeedOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST,                   &testConcentratePumpMeasuredSpeedOverride },
@@ -284,6 +277,7 @@
     { MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                      &testPreGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_STATUS_REQUEST,                                                 &testGetFPDefeaturedStatus },
+    { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
     { MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST,                                        &testIOFPSetValveRecoveryConfig },
 };
 
@@ -577,7 +571,7 @@
  * @param alarm ID of alarm triggered
  * @param almData1 1st data associated with alarm
  * @param almData2 2nd data associated with alarm
- * @return TRUE if msg successfully queued for transmit, FALSE if not
+ * @return TRUE if msg successfully queued for transmit, FALSE if not.
  *************************************************************************/
 BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2, ALARM_SOURCE_T almSource )
 {