Index: firmware/App/DGCommon.h
===================================================================
diff -u -r4b208641ed0c22d13211e6343ffaec9778560cc5 -r97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 4b208641ed0c22d13211e6343ffaec9778560cc5)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c)
@@ -55,6 +55,7 @@
     #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1          // Not needed
 //    #define NEW_FMD_FLOW_SENSOR             1            // Not needed
     #define DISABLE_HEATERS_EFFICIENCY      1
+    #define DISABLE_HEAT_DISINFECT_CONDUCTIVITY 1           // Implement
 
     // Turn these flags on to disable dialysate mixing
     #define DISABLE_DIALYSATE_CHECK         1  // Disabled for Tom  // Implement
Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r02654dc5b372b3af948ebd28aabb95cc4b51c785 -r97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 02654dc5b372b3af948ebd28aabb95cc4b51c785)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c)
@@ -1719,9 +1719,7 @@
 /*********************************************************************//**
  * @brief
  * The handleChemicalDisinfectCancelModeWaterPathState function handles the
- * chemical disinfect cancel mode cold water path state. The state resets all
- * the actuators.
- * TODO fill up as the state goes
+ * chemical disinfect cancel mode cold water path state.
  * @details Inputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer
  * @details Outputs: rsrvr1Status, rsrvr2Status, cancellationMode, stateTimer,
  * chemDisinfectUIState
@@ -1895,6 +1893,7 @@
 static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout )
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
+    BOOL isDrainComplete         = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
 
     // If the drain parameters of the reservoir is not initialized, initialize them
     if ( FALSE == haveDrainParamsBeenInit )
@@ -1903,8 +1902,6 @@
         haveDrainParamsBeenInit = TRUE;
     }
 
-    BOOL isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
-
     if ( TRUE == isDrainComplete )
     {
         // Set the state timer in case it needs to be used for another timeout check
@@ -1939,7 +1936,7 @@
 {
     CHEM_DISINFECT_STATUS_T status = CHEM_DISINFECT_IN_PROGRESS;
 
-    F32 ThdTemp = getTemperatureValue( TEMPSENSORS_HEAT_DISINFECT );
+    F32 ThdTemp         = getTemperatureValue( TEMPSENSORS_HEAT_DISINFECT );
     BOOL isR1OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) - R1ChemDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
     BOOL isR2OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) - R2ChemDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
 
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r321e3603df2611c653e4bd330f640ab35822fd6d -r97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 321e3603df2611c653e4bd330f640ab35822fd6d)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c)
@@ -608,9 +608,13 @@
     // Check if flush time has elapsed
     if ( TRUE == didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
+#ifndef DISABLE_HEAT_DISINFECT_CONDUCTIVITY
         // 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 )
+#endif
         {
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );