Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r72feea33eac31b4984f1fe50ea5076d5d7fe070c
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 72feea33eac31b4984f1fe50ea5076d5d7fe070c)
@@ -55,7 +55,9 @@
 #define CONCENTRATE_PUMP_VOLUME_PER_PULSE                   ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_PULSE_PER_REV )
 
 #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 500 / TASK_GENERAL_INTERVAL )                     ///< Interval (ms/task time) at which the concentrate pump is monitored.
+
 #define CONCENTRATE_PUMP_CONTROL_INTERVAL                   ( 50 / TASK_GENERAL_INTERVAL )                      ///< Interval (ms/task time) at which the concentrate pump is controlled.
+
 #define CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD   ( 5 * MS_PER_SECOND )                               ///< Persistence period for concentrate pump speed control error.
 
 #define NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK          1                                                   ///< Number of acid and bicarb non-volatile data to check.
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r72feea33eac31b4984f1fe50ea5076d5d7fe070c
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 72feea33eac31b4984f1fe50ea5076d5d7fe070c)
@@ -178,6 +178,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -188,6 +189,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -219,13 +221,16 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         if ( TRUE == heatersStatus[ heater ].hasTargetTempChanged )
         {
             status = TRUE;
             heatersStatus[ heater ].startHeaterSignal = TRUE;
         }
+#endif
     }
     else
     {
@@ -903,12 +908,12 @@
     if ( trimmerHeaterInternalTemp > HEATERS_MAX_ALLOWED_INTERNAL_TEMPERATURE_C )
     {
         isTempOut = TRUE;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, trimmerHeaterInternalTemp );
+        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, trimmerHeaterInternalTemp );
     }
     else if ( trimmerHeaterColdJunctionTemp > HEATERS_MAX_ALLOWED_COLD_JUNCTION_TEMPERATURE_C )
     {
         isTempOut = TRUE;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, trimmerHeaterColdJunctionTemp );
+        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, trimmerHeaterColdJunctionTemp );
     }
 
 #ifndef IGNORE_HEATERS_MONITOR
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r72feea33eac31b4984f1fe50ea5076d5d7fe070c
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 72feea33eac31b4984f1fe50ea5076d5d7fe070c)
@@ -367,12 +367,11 @@
         measuredROFlowRateLPM.data = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) -
                                             ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER );
 
-       // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that
-       // the flow is 0.
-       if ( FLOW_SENSOR_ZERO_READING == roFlowReading )
-       {
-          measuredROFlowRateLPM.data = 0.0;
-       }
+        // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that the flow is 0.
+        if ( FLOW_SENSOR_ZERO_READING == roFlowReading )
+        {
+            measuredROFlowRateLPM.data = 0.0;
+        }
 
         measuredFlowReadingsSum = 0;
         flowFilterCounter       = 0;
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 -r72feea33eac31b4984f1fe50ea5076d5d7fe070c
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f3a37b79a275a1854bf122ccf88669eaf97e5b17)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 72feea33eac31b4984f1fe50ea5076d5d7fe070c)
@@ -166,7 +166,7 @@
 static BOOL isADCReadValid( U32 sensorIndex, U32 fpgaError, U32 fpgaCount );
 static void processADCRead( U32 sensorIndex, S32 adc );
 static void publishTemperatureSensorsData( void );
-static void monitorTemperatureSnsrs( U32 sensorIndex );
+static void monitorTemperatureSnsrs( U32 sensorIndex, F32 temperature );
 
 /*********************************************************************//**
  * @brief
@@ -382,7 +382,7 @@
 
     if ( sensorIndex < NUM_OF_TEMPERATURE_SENSORS )
     {
-        if ( OVERRIDE_KEY == tempSensors[ sensorIndex ].temperatureValues.override )
+        if ( tempSensors[ sensorIndex ].temperatureValues.override == OVERRIDE_KEY )
         {
             temperature = tempSensors[ sensorIndex ].temperatureValues.ovData;
         }
@@ -722,7 +722,7 @@
     tempSensors[ sensorIndex ].temperatureValues.data = temperature;
 
     // Monitor the temperature value
-    monitorTemperatureSnsrs( sensorIndex );
+    monitorTemperatureSnsrs( sensorIndex, temperature );
 }
 
 /*********************************************************************//**
@@ -889,14 +889,17 @@
  * @details Inputs: tempSensors
  * @details Outputs: tempSensors
  * @param sensorIndex the index of the temperature sensor
+ * @param temperature the temperature value to be checked
  * @return none
  *************************************************************************/
-static void monitorTemperatureSnsrs( U32 sensorIndex )
+static void monitorTemperatureSnsrs( U32 sensorIndex, F32 temperature )
 {
-    F32 temperature = getTemperatureValue( sensorIndex );
+    // The maximum allowed temperature is different for the sensors that are in the fluid path
+    // with the ones that are not in the fluid path
+    F32 maxLimit = tempSensors[ sensorIndex ].maxAllowedTemperature;
 
     // Check both temperature and to be in range
-    if ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ sensorIndex ].maxAllowedTemperature ) )
+    if ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > maxLimit ) )
     {
         // TODO investigate
         //checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TRUE, sensorIndex, temperature );
@@ -925,7 +928,7 @@
 
     if ( sensorIndex < NUM_OF_TEMPERATURE_SENSORS )
     {
-        if ( TRUE == isTestingActivated() )
+        if ( isTestingActivated() )
         {
             result = TRUE;
             tempSensors[ sensorIndex ].temperatureValues.ovData   = temperature;
@@ -951,7 +954,7 @@
 
     if ( sensorIndex < NUM_OF_TEMPERATURE_SENSORS )
     {
-        if ( TRUE == isTestingActivated() )
+        if ( isTestingActivated() )
         {
             result = TRUE;
             tempSensors[ sensorIndex ].temperatureValues.override = OVERRIDE_RESET;
@@ -975,7 +978,7 @@
 {
     BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
+    if ( isTestingActivated() )
     {
         U32 interval = value / TASK_PRIORITY_INTERVAL;
 
@@ -999,7 +1002,7 @@
 {
     BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
+    if ( isTestingActivated() )
     {
         result = TRUE;
         tempSensorsPublishInterval.override = OVERRIDE_RESET;