Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r652b062698ad294c2bd27db3f836b60c69219311 -r49fc0dc4ab5cad74b657c8443e40a69c8371a876
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 652b062698ad294c2bd27db3f836b60c69219311)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 49fc0dc4ab5cad74b657c8443e40a69c8371a876)
@@ -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 -r4b208641ed0c22d13211e6343ffaec9778560cc5 -r49fc0dc4ab5cad74b657c8443e40a69c8371a876
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 4b208641ed0c22d13211e6343ffaec9778560cc5)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 49fc0dc4ab5cad74b657c8443e40a69c8371a876)
@@ -174,6 +174,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -184,6 +185,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -215,13 +217,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
     {
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r4b208641ed0c22d13211e6343ffaec9778560cc5 -r49fc0dc4ab5cad74b657c8443e40a69c8371a876
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 4b208641ed0c22d13211e6343ffaec9778560cc5)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 49fc0dc4ab5cad74b657c8443e40a69c8371a876)
@@ -369,12 +369,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/DGCommon.h
===================================================================
diff -u -r4b208641ed0c22d13211e6343ffaec9778560cc5 -r49fc0dc4ab5cad74b657c8443e40a69c8371a876
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 4b208641ed0c22d13211e6343ffaec9778560cc5)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 49fc0dc4ab5cad74b657c8443e40a69c8371a876)
@@ -25,7 +25,7 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        18
+#define DG_VERSION_BUILD        118
 
 // ********** build switches **********