Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rd32f890bb6c238c95bcaca54da79d7aa4a1898cb -r73f0cd487a13d55cf790b3c34f1e9ccc12b6c38f
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision d32f890bb6c238c95bcaca54da79d7aa4a1898cb)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 73f0cd487a13d55cf790b3c34f1e9ccc12b6c38f)
@@ -646,7 +646,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/Heaters.c
===================================================================
diff -u -rd32f890bb6c238c95bcaca54da79d7aa4a1898cb -r73f0cd487a13d55cf790b3c34f1e9ccc12b6c38f
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision d32f890bb6c238c95bcaca54da79d7aa4a1898cb)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 73f0cd487a13d55cf790b3c34f1e9ccc12b6c38f)
@@ -191,6 +191,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -201,6 +202,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -246,6 +248,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r46dc6530881c0d2a8dc46a6fceb2be43f5d7ca27 -r73f0cd487a13d55cf790b3c34f1e9ccc12b6c38f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 46dc6530881c0d2a8dc46a6fceb2be43f5d7ca27)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 73f0cd487a13d55cf790b3c34f1e9ccc12b6c38f)
@@ -423,7 +423,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -3638,37 +3637,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3807,10 +3775,41 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
- * request to set the fans RPM alarm start time offset.
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
  * @details Inputs: none
  * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3833,7 +3832,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none