Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rfd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a -rbc85a63a8b467a0d65328dfb689695590d5f2097
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision fd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision bc85a63a8b467a0d65328dfb689695590d5f2097)
@@ -759,6 +759,7 @@
                    pow( compensatedValue, 2 ) * condSensorsCalRecord.condSensors[ calTableId ].secondOrderCoeff +
                         compensatedValue      * condSensorsCalRecord.condSensors[ calTableId ].gain             +
                                                 condSensorsCalRecord.condSensors[ calTableId ].offset;
+
     return conductivity;
 }
 
Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rfd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a -rbc85a63a8b467a0d65328dfb689695590d5f2097
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision fd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision bc85a63a8b467a0d65328dfb689695590d5f2097)
@@ -297,7 +297,6 @@
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_YELLOW );
 
     // Set CD1 and CD2 conductivity sensors calibration table to be picked from the chemical disinfect calibration record
-    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD1_SENSOR, CAL_DATA_CD1_COND_SENSOR_CHEM_DISINFECT );
     setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR_CHEM_DISINFECT );
 
 #ifndef _RELEASE_
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -re77916f2c497a4475d0c442067782614931e43a1 -rbc85a63a8b467a0d65328dfb689695590d5f2097
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision e77916f2c497a4475d0c442067782614931e43a1)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision bc85a63a8b467a0d65328dfb689695590d5f2097)
@@ -115,6 +115,9 @@
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
 
+    // Set back the conductivity of CD2 calibration table to the normal calibration table
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR );
+
     signalDrainPumpHardStop();
     requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
     requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
@@ -404,7 +407,7 @@
  * The handleRefillState function executes refill state of the handle bad
  * fill state machine.
  * @details Inputs: none
- * @details Outputs: none
+ * @details Outputs: handleBadFillFlag, genIdleState
  * @return the next state
  *************************************************************************/
 static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleRefillState( void )