Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r95eefee71702fbf031025dc35ebaf553dfb050b7 -r48ea28a08999dcf46985b20ea635fa504f569e57
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 48ea28a08999dcf46985b20ea635fa504f569e57)
@@ -55,6 +55,7 @@
 #define MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS       ( 60 * MS_PER_SECOND )                      ///< Conductivity sensor error window.
 
 #define RO_REJECTION_RATIO_OUT_OF_RANGE_VALUE           1.0F                                        ///< Out of range value for RO rejection ratio when CPi conductivity is zero.
+
 #define MAX_RO_REJECTION_RATIO_ALLOW                    0.10F                                       ///< Maximum RO rejection ratio.
 #define MAX_CPO_CONDUCTIVITY_ALLOW                      30.0                                        ///< Maximum CPo sensor conductivity value.
 
@@ -152,6 +153,7 @@
 
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, MAX_CONDUCTIVITY_SENSOR_FAILURES, MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS );
     initPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
+
     initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, RO_REJECTION_RATIO_PERSISTENCE_PERIOD, RO_REJECTION_RATIO_PERSISTENCE_PERIOD );
@@ -239,11 +241,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 -r95eefee71702fbf031025dc35ebaf553dfb050b7 -r48ea28a08999dcf46985b20ea635fa504f569e57
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 48ea28a08999dcf46985b20ea635fa504f569e57)
@@ -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/LoadCell.c
===================================================================
diff -u -r1af5c9d200064f18e2727e896f74308e683492a7 -r48ea28a08999dcf46985b20ea635fa504f569e57
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 48ea28a08999dcf46985b20ea635fa504f569e57)
@@ -95,7 +95,7 @@
  * @details Outputs: LoadCell module initialized.
  * @return none
  *************************************************************************/
- void initLoadCell( void )
+void initLoadCell( void )
 {
     U32 i;
     U32 j;
Index: firmware/App/DGCommon.h
===================================================================
diff -u -r1af5c9d200064f18e2727e896f74308e683492a7 -r48ea28a08999dcf46985b20ea635fa504f569e57
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 48ea28a08999dcf46985b20ea635fa504f569e57)
@@ -25,7 +25,7 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        24
+#define DG_VERSION_BUILD        151
 
 // ********** build switches **********
 
@@ -56,6 +56,7 @@
 //    #define NEW_FMD_FLOW_SENSOR             1            // Not needed
     #define DISABLE_HEATERS_EFFICIENCY      1
     #define DISABLE_COND_STATUS_CHECK       1            /// Build switch
+
     #define DISABLE_DISINFECT_CONDUCTIVITY 1           // Implement
 //    #define DISABLE_CONC_PUMPS             1
 //    #define DISABLE_CAP_SWITCHES            1           // Implement
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -re1c23ba7cd93c1d63ffdcbd894aa95ac7c39b584 -r48ea28a08999dcf46985b20ea635fa504f569e57
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e1c23ba7cd93c1d63ffdcbd894aa95ac7c39b584)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 48ea28a08999dcf46985b20ea635fa504f569e57)
@@ -1122,11 +1122,11 @@
                 break;
 
             case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
-                handleFilterFlushTimePeriodOverride( message );
+                handleFilterFlushTimePeriodOverride(message);
                 break;
 
-            case MSG_ID_DG_FANS_RPM_OVERRIDE:
-                handleFansRPMOverride( message );
+            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
+                handleTestBlockMessagesRequest( message );
                 break;
 
             case MSG_ID_DG_STOP_RTC_CLOCK:
@@ -1137,10 +1137,6 @@
                 handleSetDrainPumpMeasuredRPMOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
-                handleTestBlockMessagesRequest( message );
-                break;
-
             case MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD:
                 handleTestSuperClearAlarmsRequest( message );
                 break;
@@ -1153,6 +1149,10 @@
                 handleTestFansRPMAlarmStartTimeOffsetRequest( message );
                 break;
 
+            case MSG_ID_DG_FANS_RPM_OVERRIDE:
+                handleFansRPMOverride( message );
+                break;
+
             case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE:
                 handleTestUsedAcidVolumeMLOverrideRequest( message );
                 break;