Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r61fc45d7a43557312d6abd00a6b01e6823b44f04 -r2b9d10664884e9b20d391cc3178d3c85347cdf2c
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 61fc45d7a43557312d6abd00a6b01e6823b44f04)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 2b9d10664884e9b20d391cc3178d3c85347cdf2c)
@@ -232,6 +232,7 @@
 {
     checkRORejectionRatio();
     checkDialysateTemperatureSensors();
+    setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() );
 
     fillState = ( TRUE == areInletWaterConditionsAlarmsActive() ? DG_FILL_MODE_STATE_PAUSED : fillState );
 
@@ -731,14 +732,20 @@
 static DG_FILL_MODE_STATE_T handleDeliverDialysateState( void )
 {
     DG_ACID_CONCENTRATES_RECORD_T acid;
-    F32 acidMix;
     DG_BICARB_CONCENTRATES_RECORD_T bicarb;
-    F32 bicarbMix;
-    DG_FILL_MODE_STATE_T result         = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
-    DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
-    F32  acidConductivity               = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-    F32  bicarbConductivity             = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
+    F32 acidMix                     = 0.0F;
+    F32 bicarbMix                   = 0.0F;
+    DG_FILL_MODE_STATE_T result     = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
+    DG_RESERVOIR_ID_T inactiveRsrvr = getInactiveReservoir();
+    F32 acidConductivity            = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
+    F32 bicarbConductivity          = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
+    F32 inletTemperature            = getTemperatureValue( (U32)TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
 
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) )
+    {
+        inletTemperature = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
+    }
+
     getAcidConcentrateCalRecord( &acid );
     getBicarbConcentrateCalRecord( &bicarb );
 
@@ -769,7 +776,7 @@
     // DG is delivering dialysate keep collecting the sample counter and the measured flow
     fillStatus.fillSampleCounter         += 1;
     fillStatus.fillFlowRateRunningSum    += getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
-    fillStatus.fillTemperatureRunningSum += getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
+    fillStatus.fillTemperatureRunningSum += inletTemperature;
 
     // TODO: Check for open straw door status and alarm if closed
     // Check if run out of time to fill the reservoir
@@ -779,9 +786,9 @@
     }
 
     // If we've reached our target fill to volume (by weight), we're done filling - go back to generation idle mode  // SRSDG 398
-    if ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) )
+    if ( TRUE == hasTargetFillVolumeBeenReached( inactiveRsrvr ) )
     {
-        F32 filledVolumeML                           = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight;
+        F32 filledVolumeML                           = getReservoirWeight( inactiveRsrvr ) - reservoirBaseWeight;
         F32 integratedVolumeToLoadCellReadingPercent = fabs( 1.0F - ( filledVolumeML / integratedVolumeML ) );
         F32 avgAcidConductivity                      = acidConductivityTotal / conductivitySampleCount;
         F32 avgBicarbConductivity                    = bicarbConductivityTotal / conductivitySampleCount;
@@ -830,7 +837,7 @@
         fillStatus.fillFlowRateRunningSum    = 0.0F;
         fillStatus.fillTemperatureRunningSum = 0.0F;
         fillStatus.fillSampleCounter         = 0;
-        fillStatus.fillLastTemperature       = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
+        fillStatus.fillLastTemperature       = inletTemperature;
 
         calculateHeaterEstimationGain( DG_PRIMARY_HEATER );
         requestNewOperationMode( DG_MODE_GENE );