Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rf364406cd1f672078ca38ae8aad5bc508e9b64dd -rb65c5a8339507472f1933979c21af7601abf9c1a
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision f364406cd1f672078ca38ae8aad5bc508e9b64dd)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision b65c5a8339507472f1933979c21af7601abf9c1a)
@@ -870,6 +870,7 @@
     {
         setFPGAD76PumpSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE );
     }
+    //TODO: revert back once issue resolved
 #if 0
     // Park concentrate pump too if requested
     if ( TRUE == parkPump )
Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -rcf3c037762699407089411de04bc9d1f4b597784 -rb65c5a8339507472f1933979c21af7601abf9c1a
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision cf3c037762699407089411de04bc9d1f4b597784)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision b65c5a8339507472f1933979c21af7601abf9c1a)
@@ -733,8 +733,8 @@
             }
             else
             {
-                lastBicarbMixVolume = getBicarbMixVol();
                 //use the previous value
+                lastBicarbMixVolume = getBicarbMixVol();
             }
 
             debugBicarbControl = getDebugPIControllerSignals( PI_CONTROLLER_ID_BICARB_VOL );
Index: firmware/App/Drivers/TemperatureSensors.c
===================================================================
diff -u -rf364406cd1f672078ca38ae8aad5bc508e9b64dd -rb65c5a8339507472f1933979c21af7601abf9c1a
--- firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f364406cd1f672078ca38ae8aad5bc508e9b64dd)
+++ firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision b65c5a8339507472f1933979c21af7601abf9c1a)
@@ -378,6 +378,7 @@
         }
     }
 
+   //TODO: revert back once issue resolved
    //checkPersistentAlarm( ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE, isTemperatureOutOfRange, sensorInAlarm, alarmTemperature );
 
     //check freshness of temperature read
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r9eae2f683887bededd2240f51ddfc667d8c1d566 -rb65c5a8339507472f1933979c21af7601abf9c1a
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 9eae2f683887bededd2240f51ddfc667d8c1d566)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision b65c5a8339507472f1933979c21af7601abf9c1a)
@@ -35,8 +35,8 @@
 #define COND_SENSOR_REPORT_PERIOD               ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                              ///< Broadcast conductivity values message every second.
 #define COND_SENSOR_UPDATE_INTERVAL             ( 700 / TASK_PRIORITY_INTERVAL )                                        ///< Time in task intervals for new sensor data
 #define DATA_PUBLISH_COUNTER_START_COUNT        40                                                                      ///< Data publish counter start count.
-#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 50 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
-#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 50 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 210 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 30 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
 #define SIZE_OF_COND_ROLLING_AVG                ( CONDUCTIVITY_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )              ///< Filtered conductivity moving average sample count.
 #define SIZE_OF_COND_TEMP_ROLLING_AVG           ( CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )         ///< Filtered conductivity temprature moving average sample count.
 #define RO_RR_MOVING_AVG_NUM_OF_SAMPLES         30                                                                      ///< RO rejection ratio moving average number of samples.