Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r8fc97ad09c8cbdf76dc19929c4751df3feacb40d -r56702763f5924c01dd4aae083400a9998081e829
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 8fc97ad09c8cbdf76dc19929c4751df3feacb40d)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 56702763f5924c01dd4aae083400a9998081e829)
@@ -55,6 +55,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.
 
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r413eacfaf3a6a960bdfe1c0bbe5c2787520a726d -r56702763f5924c01dd4aae083400a9998081e829
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 413eacfaf3a6a960bdfe1c0bbe5c2787520a726d)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 56702763f5924c01dd4aae083400a9998081e829)
@@ -184,6 +184,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -194,6 +195,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -227,6 +229,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r8fc97ad09c8cbdf76dc19929c4751df3feacb40d -r56702763f5924c01dd4aae083400a9998081e829
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 8fc97ad09c8cbdf76dc19929c4751df3feacb40d)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 56702763f5924c01dd4aae083400a9998081e829)
@@ -318,15 +318,15 @@
 {
     DG_POST_STATE_T result = postState;
 
-    if ( ( SELF_TEST_STATUS_PASSED == testStatus ) || ( SELF_TEST_STATUS_FAILED == testStatus ) )
+    if ( ( testStatus == SELF_TEST_STATUS_PASSED ) || ( testStatus == SELF_TEST_STATUS_FAILED ) )
     {
-        BOOL passed = ( SELF_TEST_STATUS_PASSED == testStatus ? TRUE : FALSE );
+        BOOL passed = ( testStatus == SELF_TEST_STATUS_PASSED ? TRUE : FALSE );
 
         // Broadcast passed POST result
         sendPOSTTestResult( (DG_POST_STATE_T)((int)postState), passed );
         // Move on to next POST test
         result = (DG_POST_STATE_T)((int)postState + 1);
-        if ( SELF_TEST_STATUS_FAILED == testStatus )
+        if ( testStatus == SELF_TEST_STATUS_FAILED )
         {
             tempPOSTPassed = FALSE;
         }
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r849d55bf09a76e59424878b1ae4dac4b51ead3a9 -r56702763f5924c01dd4aae083400a9998081e829
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 849d55bf09a76e59424878b1ae4dac4b51ead3a9)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 56702763f5924c01dd4aae083400a9998081e829)
@@ -86,6 +86,7 @@
     SW_FAULT_ID_CONCENTRATE_PUMP_EXEC_INVALID_STATE,                    // 55
     SW_FAULT_ID_CONCENTRATE_PUMP_INVALID_PUMP_ID,
     SW_FAULT_ID_SERVICE_MODE_INVALID_EXEC_STATE,
+    SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT,
     SW_FAULT_ID_UV_REACTORS_INVALID_EXEC_STATE,
     SW_FAULT_ID_UV_REACTORS_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_THERMISTORS_INVALID_EXEC_STATE,                         // 60