Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r224b86c0847207c168d38fa1713a1e9116642267 -r0b93322875e9aa5719941574fde93d3042dc6796
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 224b86c0847207c168d38fa1713a1e9116642267)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0b93322875e9aa5719941574fde93d3042dc6796)
@@ -838,9 +838,9 @@
     BOOL isSmallPriOut = ( fabs( ( HEATERS_MAX_OPERATING_VOLTAGE_V * smallPri ) - smallPriVoltage ) > smallPriVoltageTol ? TRUE : FALSE );
     BOOL isTrimmerOut  = ( fabs( ( HEATERS_MAX_OPERATING_VOLTAGE_V * trimmer )  - trimmerVoltage )  >  trimmerVoltageTol ? TRUE : FALSE );
 
-    checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isMainPriOut, mainPri, mainPriVoltageTol );
-    checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPri, smallPriVoltageTol );
-    checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, isTrimmerOut, trimmer, trimmerVoltageTol );
+    //checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isMainPriOut, mainPri, mainPriVoltageTol );
+    //checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPri, smallPriVoltageTol );
+    //checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, isTrimmerOut, trimmer, trimmerVoltageTol );
 }
 
 
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rf639bbc47806ddcefdbdce78a377cd87050872e5 -r0b93322875e9aa5719941574fde93d3042dc6796
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision f639bbc47806ddcefdbdce78a377cd87050872e5)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 0b93322875e9aa5719941574fde93d3042dc6796)
@@ -68,8 +68,11 @@
 #define FLOW_SAMPLES_TO_AVERAGE                        ( 250 / TASK_PRIORITY_INTERVAL )            ///< Averaging flow data over 250 ms intervals.
 #define FLOW_AVERAGE_MULTIPLIER                        ( 1.0F / (F32)FLOW_SAMPLES_TO_AVERAGE )     ///< Optimization - multiplying is faster than dividing.
 
+// The ADC to LPM factor is calculated using the following steps:
+// 0.1 to 2 LPM range
+// 110000 pulses/liter
+// For 2 LPM => 2LPM x 110000 pulses/liter * 1 edges/pulse * 1 min/60 seconds
 #define RO_FLOW_ADC_TO_LPM_FACTOR                      272.72F                                     ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
-
 #define ROP_FLOW_TO_PWM_SLOPE                          0.1F                                        ///< Slope of flow to PWM line equation.
 #define ROP_FLOW_TO_PWM_INTERCEPT                      0.0F                                        ///< Intercept of flow to PWM line equation.
 
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rf639bbc47806ddcefdbdce78a377cd87050872e5 -r0b93322875e9aa5719941574fde93d3042dc6796
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f639bbc47806ddcefdbdce78a377cd87050872e5)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 0b93322875e9aa5719941574fde93d3042dc6796)
@@ -869,10 +869,15 @@
         processTempSnsrsADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_1, getFPGACD1Temp(), errorCount, readCount, FALSE );
         processTempSnsrsADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_2, getFPGACD2Temp(), errorCount, readCount, FALSE );
 
-        /*errorCount = (U32)getFPGATHdErrorCount();
-        readCount  = (U32)getFPGATHdReadCount();
-        processTempSnsrsADCRead( TEMPSENSORS_HEAT_DISINFECT,    getFPGATHdTemp(),         errorCount, readCount, TRUE );
-        processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_THD_RTD,  getFPGATHdInternalTemp(), errorCount, readCount, FALSE );*/
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+        {
+            //errorCount = (U32)getFPGATHdErrorCount();
+            //readCount  = (U32)getFPGATHdReadCount();
+            //processTempSnsrsADCRead( TEMPSENSORS_HEAT_DISINFECT,    getFPGATHdTemp(),         errorCount, readCount, TRUE );
+            //processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_THD_RTD,  getFPGATHdInternalTemp(), errorCount, readCount, FALSE );
+        }
 
         errorCount = (U32)getFPGATRoErrorCount();
         readCount  = (U32)getFPGATRoReadCount();