Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d -r8074ecece0b11532c173ad951a98036f0c54ca52
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8074ecece0b11532c173ad951a98036f0c54ca52)
@@ -19,6 +19,7 @@
 
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
+#include "FlowSensors.h"
 #include "FPGA.h"
 #include "CPLD.h"
 #include "Heaters.h"
@@ -471,7 +472,7 @@
         bicarbMix = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio;
 
         setROPumpTargetFlowRateLPM( getTargetFillFlowRateLPM(), TARGET_RO_PRESSURE_PSI );
-        handleDialysateMixing( getMeasuredROFlowRateLPM() * ML_PER_LITER, acidMix, bicarbMix );
+        handleDialysateMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, acidMix, bicarbMix );
         requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
         requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
         result = DG_FILL_MODE_STATE_PRODUCE_DIALYSATE;
@@ -670,7 +671,7 @@
             bicarbMix = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio;
 
             setROPumpTargetFlowRateLPM( getTargetFillFlowRateLPM(), TARGET_RO_PRESSURE_PSI );
-            handleDialysateMixing( getMeasuredROFlowRateLPM() * ML_PER_LITER, acidMix, bicarbMix );
+            handleDialysateMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, acidMix, bicarbMix );
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 
             // Do the necessary setup here before transition to Produce Dialysate State
@@ -710,7 +711,7 @@
     bicarbMix = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio;
 
     // Prime mixing before deliver result to reservoir
-    handleDialysateMixing( getMeasuredROFlowRateLPM() * ML_PER_LITER, acidMix, bicarbMix );
+    handleDialysateMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, acidMix, bicarbMix );
 
     if ( concentratePumpPrimeCount++ > CONCENTRATE_PUMP_PRIME_INTERVAL )
     {
@@ -750,19 +751,18 @@
     bicarbMix = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio;
 
     // Set concentrate pumps speed based on the RO pump flow rate
-    handleDialysateMixing( getMeasuredROFlowRateLPM() * ML_PER_LITER, acidMix, bicarbMix );
+    handleDialysateMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, acidMix, bicarbMix );
 
     integratedVolumeML      += getMeasuredROFlowRateWithConcPumpsLPM() * ( (F32)TASK_GENERAL_INTERVAL / (F32)( SEC_PER_MIN ) );
     usedAcidVolumeML.data   += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR;
     usedBicarbVolumeML.data += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) * FLOW_INTEGRATOR;
-
     acidConductivityTotal   += acidConductivity;
     bicarbConductivityTotal += bicarbConductivity;
     conductivitySampleCount++;
 
     // DG is delivering dialysate keep collecting the sample counter and the measured flow
     fillStatus.fillSampleCounter         += 1;
-    fillStatus.fillFlowRateRunningSum    += getMeasuredROFlowRateLPM();
+    fillStatus.fillFlowRateRunningSum    += getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
     fillStatus.fillTemperatureRunningSum += getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
 
     // TODO: Check for open straw door status and alarm if closed
@@ -827,7 +827,6 @@
         fillStatus.fillLastTemperature       = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
 
         calculateHeaterEstimationGain( DG_PRIMARY_HEATER );
-
         requestNewOperationMode( DG_MODE_GENE );
     }
 
@@ -909,9 +908,14 @@
     F32 TRo         = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
     BOOL isDriftOut = ( fabs( TDi - TRo ) >= DIALYSATE_TEMPERATURE_SENSORS_MAX_DRIFT_C ? TRUE : FALSE );
 
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, isDriftOut ) )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        activateAlarmNoData( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE );
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, isDriftOut ) )
+        {
+            activateAlarmNoData( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE );
+        }
     }
 }