Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r5652568f680408e60fe5fb84eee926e8804c07d7 -ra069a798bc85ad39afb0df9b440457c1f18f2ba3
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 5652568f680408e60fe5fb84eee926e8804c07d7)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision a069a798bc85ad39afb0df9b440457c1f18f2ba3)
@@ -187,8 +187,9 @@
     emstatBoardRead[ EMSTAT_CPI_CPO_BOARD ].sensors[ EMSTAT_CPO_OR_CD2_INDEX ].condSnsrTempSnsr     = TEMPSENSORS_OUTLET_PRIMARY_HEATER;
     emstatBoardRead[ EMSTAT_CPI_CPO_BOARD ].sensors[ EMSTAT_CPO_OR_CD2_INDEX ].condSnsrHex2StrAlarm = ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR;
     // CD1/CD2 Emstat board conductivity sensors and their corresponding temperature sensors
+    // NOTE: For CD1, use TD2 temperature sensor for compensation since it is a more accurate temperature sensor
     emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPI_OR_CD1_INDEX ].condSnsr             = CONDUCTIVITYSENSORS_CD1_SENSOR;
-    emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPI_OR_CD1_INDEX ].condSnsrTempSnsr     = TEMPSENSORS_CONDUCTIVITY_SENSOR_1;
+    emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPI_OR_CD1_INDEX ].condSnsrTempSnsr     = TEMPSENSORS_CONDUCTIVITY_SENSOR_2;
     emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPI_OR_CD1_INDEX ].condSnsrHex2StrAlarm = ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR;
     emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPO_OR_CD2_INDEX ].condSnsr             = CONDUCTIVITYSENSORS_CD2_SENSOR;
     emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPO_OR_CD2_INDEX ].condSnsrTempSnsr     = TEMPSENSORS_CONDUCTIVITY_SENSOR_2;
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r2b47dd2e7974618d8899527cdbff80fa93ebc9fa -ra069a798bc85ad39afb0df9b440457c1f18f2ba3
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 2b47dd2e7974618d8899527cdbff80fa93ebc9fa)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision a069a798bc85ad39afb0df9b440457c1f18f2ba3)
@@ -110,6 +110,7 @@
 static DG_HEATING_CAL_RECORD_T heatingConstsCalRecord;                                            ///< DG heating calibration record.
 static DG_ACID_CONCENTRATES_RECORD_T acidConcentrateCalRecord;                                    ///< Acid concentrate calibration record.
 static DG_BICARB_CONCENTRATES_RECORD_T bicarbConcentrateCalRecord;                                ///< Bicarb concentrate calibration record.
+static DG_CHEMICALS_FILL_COND_CAL_RECORD_T fillCondCalRecord;                                     ///< Fill conductivities calibration record.
 static F32 targetFillFlowRateLPM;                                                                 ///< Target fill flow rate in L/min.
 static BOOL isThisTheFirstCycle;                                                                  ///< Boolean flag to indicate whether this is the first cycle.
 static RESERVOIRS_PREVIOUS_STATUS reservoirPreviousStatus[ NUM_OF_DG_RESERVOIRS ];                ///< Reservoirs previous status.