Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -reae0635792a827b7cf9197cf6f6e253f2a094260 -r0b121a7c92a8d86f8369b7094b0bce21389f3747
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision eae0635792a827b7cf9197cf6f6e253f2a094260)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 0b121a7c92a8d86f8369b7094b0bce21389f3747)
@@ -739,11 +739,12 @@
     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 );         // TODO the systems team will let us know when we can use TD2 in DVT. Until then it is disabled
-    F32 inletTemperature            = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER ); //getTemperatureValue( (U32)TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
+    F32 bicarbConductivity          = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
+    F32 inletTemperature            = getTemperatureValue( (U32)TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
 
 #ifndef _RELEASE_
-    if ( HW_CONFIG_BETA == getHardwareConfigStatus() )
+    if ( ( HW_CONFIG_BETA == getHardwareConfigStatus() ) ||
+         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_USING_TPO_FOR_PRIMARY_HEATER_CONTROL ) ) )
     {
         inletTemperature = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
     }