Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rb8a409a6f04c2912cb20eb4c9191bff573080162 -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision b8a409a6f04c2912cb20eb4c9191bff573080162)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
@@ -612,13 +612,23 @@
     // Check if flush time has elapsed
     if ( TRUE == didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
-#ifndef DISABLE_HEAT_DISINFECT_CONDUCTIVITY
+        BOOL hasConductivityPassed = FALSE;
+
         // If the inlet temperature and conductivity are in range, move onto the next state
         if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
              ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
-#else
-        if ( TRUE )
+        {
+            hasConductivityPassed = TRUE;
+        }
+
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            hasConductivityPassed = TRUE;
+        }
 #endif
+
+        if ( TRUE == hasConductivityPassed )
         {
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -696,15 +706,13 @@
         else
         {
             areTempSensorsInRange = TRUE;
-#ifndef IGNORE_CONC_PUMP_IN_HEAT_DISINFECT
             // Turn the pumps on in reverse
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   ACID_PUMP_SPEED_ML_PER_MIN );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, ACID_PUMP_SPEED_ML_PER_MIN );
 
             // Turn on the concentrate pumps
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
-#endif
+            requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
+            requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
             concentratePumpsPrimeTimer = getMSTimerCount();
         }
     }
@@ -1566,15 +1574,14 @@
 
             // Turn on the drain pump to drain R2
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
-#ifndef IGNORE_CONC_PUMP_IN_HEAT_DISINFECT
+
             // Turn the pumps on in reverse
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   ACID_PUMP_SPEED_ML_PER_MIN );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, ACID_PUMP_SPEED_ML_PER_MIN );
 
             // Turn on the concentrate pumps
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
-#endif
+            requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
+            requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 
             // This is the last drain of heat disinfect cycle
             isThisLastDrain = TRUE;
@@ -1962,15 +1969,13 @@
         // In disinfect R1 to R2, concentrate pumps are also run
         if ( DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2 == heatDisinfectState )
         {
-#ifndef IGNORE_CONC_PUMP_IN_HEAT_DISINFECT
             // Turn the pumps on in reverse
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   ACID_PUMP_SPEED_ML_PER_MIN );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN );
 
             // During R1 to R2 disinfect, the concentrate pumps turn on
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
-#endif
+            requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
+            requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
         }
     }
     else if ( ( TRUE == isPartialDisinfectInProgress ) && ( ThdTemp > HEAT_DISINFECT_START_TEMPERATURE_C ) )