Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -re3839e10decfadf12a8fb2b9f8c049d8a30e945b -r7c5eba5948a1ed940252c6fe0b1c56f17b313980
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e3839e10decfadf12a8fb2b9f8c049d8a30e945b)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 7c5eba5948a1ed940252c6fe0b1c56f17b313980)
@@ -259,6 +259,9 @@
     {
         getNVRecord2Driver( GET_CAL_CONDUCTIVITY_SENSORS, (U08*)&condSensorsCalRecord, sizeof( condSensorsCalRecord ),
                             NUM_OF_CAL_DATA_COND_SENSORS, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD );
+
+        getNVRecord2Driver( GET_CAL_CONDUCTIVITY_SENSORS_TEMP_COMP, (U08*)&condSensorsTempCompCalRecord, sizeof( DG_COND_SENSORS_TEMP_COMP_CAL_RECORD_T ),
+                                             NUM_OF_CAL_DATA_COND_SENSORS_TEMP_COMP, ALARM_ID_DG_COND_SENSORS_INVALID_TEMP_COMP_CAL_RECORD );
     }
 
 #ifndef _RELEASE_
Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -re3839e10decfadf12a8fb2b9f8c049d8a30e945b -r7c5eba5948a1ed940252c6fe0b1c56f17b313980
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision e3839e10decfadf12a8fb2b9f8c049d8a30e945b)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 7c5eba5948a1ed940252c6fe0b1c56f17b313980)
@@ -198,7 +198,6 @@
 
     // initialize FPGA drain pump  hall sensor error
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_DRAIN_PUMP_HALL_SENSOR_ERROR, MAX_FPGA_DRAIN_PUMP_DIRECTION_FAULT_FAILURES, MAX_FPGA_DRAIN_PUMP_DIRECTION_FAULT_WINDOW_MS);
-
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -re3839e10decfadf12a8fb2b9f8c049d8a30e945b -r7c5eba5948a1ed940252c6fe0b1c56f17b313980
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision e3839e10decfadf12a8fb2b9f8c049d8a30e945b)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 7c5eba5948a1ed940252c6fe0b1c56f17b313980)
@@ -413,6 +413,13 @@
  *************************************************************************/
 void execTemperatureSensors( void )
 {
+    // Check if a new calibration is available
+    if ( TRUE == isNewCalibrationRecordAvailable() )
+    {
+        getNVRecord2Driver( GET_CAL_TEMP_SENSORS, (U08*)&tempSensorCalRecord, sizeof( DG_TEMP_SENSORS_CAL_RECORD_T ),
+                            NUM_OF_CAL_DATA_TEMP_SENSORS, ALARM_ID_DG_TEMPERATURE_SENSORS_INVALID_CAL_RECORD );
+    }
+
     // Check the status of the software configuration
     adjustTemperatureSensorsRefResistance();
 
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r581064e4188c15307a70bc4265974d61dea23ff8 -r7c5eba5948a1ed940252c6fe0b1c56f17b313980
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 581064e4188c15307a70bc4265974d61dea23ff8)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 7c5eba5948a1ed940252c6fe0b1c56f17b313980)
@@ -54,7 +54,7 @@
 #define RO_PUMP_800_ML_PER_MIN                          800.0F                                               ///< RO pump speed of 800.0 mL/minute.
 #define TARGET_RO_FLOW_RATE_IN_PAUSE_L                    0.8F                                               ///< Target flow rate for RO pump during pause in liters.
 #define MILLILITERS_PER_LITER                           1000.0F                                              ///< One liter is 1000 milliliters
-#define ACID_PUMP_23_ML_PER_MIN                         22.5F //23.0F                                                ///< Acid pump speed of 23.0 mL/minute.
+#define ACID_PUMP_23_ML_PER_MIN                         23.0F                                                ///< Acid pump speed of 23.0 mL/minute.
 #define BICARB_PUMP_40_ML_PER_MIN                       40.0F                                                ///< Bicarb pump speed of 40.0 mL/minute.
 #define CONCENTRATE_PUMP_40_ML_PER_MIN                  40.0F                                                ///< Concentrate pump speed of 40.0 mL/minute.
 
@@ -73,6 +73,7 @@
 #define RO_PUMP_LOOKUP_TABLE_SIZE                       4                                                    ///< Size of array used as RO pump speed lookup table.
 #define CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN       5.0F                                                 ///< Concentrate pump additional speed during priming in mL/min.
 #define CONCENTRATE_TEST_TIME_OUT_MS                    ( 30 * MS_PER_SECOND )                               ///< Concentrate test time out period in ms.
+#define CONCENTRATE_ACID_TEST_TIME_OUT_MS               ( 60 * MS_PER_SECOND )
 #define DELAY_FMP_CHECK_START_BY_MS                     ( 10 * MS_PER_SECOND )                               ///< Delay start of FMP check during dialysate deliver state by this amount of time (in ms).
 #define CONCENTRATE_TEST_COND_COLLECTION_DELAY_MS       ( 5 * MS_PER_SECOND )                                ///< Concentrate test conductivity data collection delay in milliseconds.
 
@@ -783,7 +784,7 @@
         acidConductivitySampleCount++;
     }
 
-    if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) )
+    if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_ACID_TEST_TIME_OUT_MS ) )
     {
         F32 acidCondUSPerCM      = chemicalsCond.fillCondValues[ chemicalsTypes.acidType ][ FILL_COND_ACID_TEST ].acidConduSPerCM;
         BOOL hasAcidTestPassed   = FALSE;