Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rfc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6 -rcc9b6f5543a7523b2173eeb5c12e81916b3e1027
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision fc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision cc9b6f5543a7523b2173eeb5c12e81916b3e1027)
@@ -56,6 +56,7 @@
 #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                   ( 1 * MS_PER_SECOND / 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.
 
@@ -596,7 +597,7 @@
 
     // Park concentrate pump too if requested
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK ) != SW_CONFIG_ENABLE_VALUE )
+    if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK ) )
     {
         if ( HW_CONFIG_BETA == getHardwareConfigStatus() )
         {
Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rfc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6 -rcc9b6f5543a7523b2173eeb5c12e81916b3e1027
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision fc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision cc9b6f5543a7523b2173eeb5c12e81916b3e1027)
@@ -290,11 +290,9 @@
 /*********************************************************************//**
  * @brief
  * The checkInletWaterConductivity function checks inlet water conductivity value
- * and triggers an alarm when conductivity value is not within the specified
- * values.
+ * and triggers an alarm when conductivity value is out of allowed range.
  * @details Inputs: CPi sensor conductivity
- * @details Outputs: Trigger warning alarm if conductivity is in the warning
- * range. Trigger alarm if conductivity is below minimum conductivity.
+ * @details Outputs: Trigger alarms when conductivity is out of allowed range
  * @return none
  *************************************************************************/
 void checkInletWaterConductivity( void )
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rfc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6 -rcc9b6f5543a7523b2173eeb5c12e81916b3e1027
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision fc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision cc9b6f5543a7523b2173eeb5c12e81916b3e1027)
@@ -186,6 +186,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -196,6 +197,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -241,6 +243,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rfc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6 -rcc9b6f5543a7523b2173eeb5c12e81916b3e1027
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision fc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision cc9b6f5543a7523b2173eeb5c12e81916b3e1027)
@@ -78,7 +78,7 @@
 
 // 2m long tubing to cap = 19.5 mL (acid line) + 7.92 mL/m * 2 m (tubing to cap) + 20.82 mL (straw) = 56.15 mL
 // Prime time in seconds = ( 56.15 mL / 48 mL/min ) x 60 second/min + 25 seconds margin time = 95 seconds.
-#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 95 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
+#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 60 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
 #define FLUSH_BUBBLES_PUMP_TIME_OUT_MS                  ( 2  * MS_PER_SECOND )                               ///< RO pump on during flush bubble interval in ms.
 #define DIALYSATE_TEMPERATURE_TOLERANCE_C               2.0F                                                 ///< Dialysate temperature tolerance in degree C.
 #define DATA_PUBLISH_COUNTER_START_COUNT                63                                                   ///< Data publish counter start count.