Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rbc85a63a8b467a0d65328dfb689695590d5f2097 -rff489c668da0650496eef9d85ac327dd38498f2d
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision bc85a63a8b467a0d65328dfb689695590d5f2097)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision ff489c668da0650496eef9d85ac327dd38498f2d)
@@ -316,11 +316,9 @@
 /*********************************************************************//**
  * @brief
  * The checkInletWaterConductivity function checks inlet water conductivity value
- * and triggers an alarm when conductivity value is not within the specified
- * values.
+ * and triggers an alarm when conductivity value is out of allowed range.
  * @details Inputs: CPi sensor conductivity
- * @details Outputs: Trigger warning alarm if conductivity is in the warning
- * range. Trigger alarm if conductivity is below minimum conductivity.
+ * @details Outputs: Trigger alarms when conductivity is out of allowed range
  * @return none
  *************************************************************************/
 void checkInletWaterConductivity( void )
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r8c24d29d5a1c0b85067d67054fee2718d425bf47 -rff489c668da0650496eef9d85ac327dd38498f2d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8c24d29d5a1c0b85067d67054fee2718d425bf47)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision ff489c668da0650496eef9d85ac327dd38498f2d)
@@ -78,7 +78,7 @@
 
 // 2m long tubing to cap = 19.5 mL (acid line) + 7.92 mL/m * 2 m (tubing to cap) + 20.82 mL (straw) = 56.15 mL
 // Prime time in seconds = ( 56.15 mL / 48 mL/min ) x 60 second/min + 25 seconds margin time = 95 seconds.
-#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 95 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
+#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 60 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
 #define FLUSH_BUBBLES_PUMP_TIME_OUT_MS                  ( 2  * MS_PER_SECOND )                               ///< RO pump on during flush bubble interval in ms.
 #define DIALYSATE_TEMPERATURE_TOLERANCE_C               2.0F                                                 ///< Dialysate temperature tolerance in degree C.
 #define DATA_PUBLISH_COUNTER_START_COUNT                63                                                   ///< Data publish counter start count.
@@ -615,7 +615,7 @@
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 
             // Prior to collecting data for bicarb test, change the CD2 calibration table
-            setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR_FILL_BICARB_TEST );
+            // setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR_FILL_BICARB_TEST ); // TODO uncomment
 
             // State transition
             concentrateTestStartTime = getMSTimerCount();
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r98059a6eef9f17d8178821f6a1fa0db44415cf7f -rff489c668da0650496eef9d85ac327dd38498f2d
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 98059a6eef9f17d8178821f6a1fa0db44415cf7f)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision ff489c668da0650496eef9d85ac327dd38498f2d)
@@ -85,8 +85,8 @@
     SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX,
     SW_FAULT_ID_CONCENTRATE_PUMP_EXEC_INVALID_STATE,                    // 55
     SW_FAULT_ID_CONCENTRATE_PUMP_INVALID_PUMP_ID,
-    SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT,
     SW_FAULT_ID_SERVICE_MODE_INVALID_EXEC_STATE,
+    SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT,
     SW_FAULT_ID_UV_REACTORS_INVALID_EXEC_STATE,
     SW_FAULT_ID_UV_REACTORS_INVALID_SELF_TEST_STATE,                    // 60
     SW_FAULT_ID_THERMISTORS_INVALID_EXEC_STATE,