Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r5315092604c1a6f4ec8ba1339809bd0099f921da -rf248e95cb4a3187aee8d7e7ea773a0549ec7be30
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 5315092604c1a6f4ec8ba1339809bd0099f921da)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision f248e95cb4a3187aee8d7e7ea773a0549ec7be30)
@@ -296,6 +296,9 @@
 
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_YELLOW );
 
+    // Set CD1 and CD2 conductivity sensors calibration table to be picked from the chemical disinfect calibration record
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR_CHEM_DISINFECT );
+
 #ifndef _RELEASE_
     if ( nelsonSupport != NELSON_CHEM_DISINFECT )
 #endif
Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rfd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a -rf248e95cb4a3187aee8d7e7ea773a0549ec7be30
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision fd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision f248e95cb4a3187aee8d7e7ea773a0549ec7be30)
@@ -8,7 +8,7 @@
 * @file    ModeChemicalDisinfectFlush.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      30-Mar-2023
+* @date    (last)      04-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  15-Nov-2022
@@ -70,7 +70,7 @@
 #define RSRVRS_DRAIN_TARGET_VOLUME_ML               200.0F                                                     ///< While filling and draining at the same time, look for a volume that indicates draining is working, ml.
 #define FLUSH_ADDITIONAL_TIME_MS                    ( 38 * MS_PER_SECOND )                                     ///< Additional time to flush after reservoir full
 #define NUM_OF_RINSE_CYCLES                         2                                                          ///< Number of rinse cycles
-#define CHEM_DISINFECT_FLUSH_TIME_MS                ( 12 * SEC_PER_MIN * MS_PER_SECOND )                       ///< Chemical disinfect flush time in ms. TODO: get the correct time for the mode or not used?
+#define CHEM_DISINFECT_FLUSH_TIME_MS                ( 12 * SEC_PER_MIN * MS_PER_SECOND )                       ///< Chemical disinfect flush time in ms.
 
 // Fill reservoirs to full defines
 #define RESERVOIR_FULL_VOLUME_CHANGE_LIMIT_ML       5.0F                                                       ///< The maximum difference between the short-term and long-term filtered reservoir volumes in ml that determines the reservoir is full.
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r5315092604c1a6f4ec8ba1339809bd0099f921da -rf248e95cb4a3187aee8d7e7ea773a0549ec7be30
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 5315092604c1a6f4ec8ba1339809bd0099f921da)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision f248e95cb4a3187aee8d7e7ea773a0549ec7be30)
@@ -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
  * @param idleState reference variable for the next idle state
  * @return the next state
  *************************************************************************/