Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rf10c653a13f97ae3d220e16f7ff1a9558606b56a -r4ebe73f0dee4b70eeea3c38a01e13f3b6817e366
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision f10c653a13f97ae3d220e16f7ff1a9558606b56a)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 4ebe73f0dee4b70eeea3c38a01e13f3b6817e366)
@@ -137,6 +137,8 @@
 
     setCurrentSubState( NO_SUB_STATE );
 
+    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_INACTIVE_RESERVOIR_TEMP_REMOVE, (U32)inactiveReservoir, 0 ) // TODO remove
+
     if ( DG_RESERVOIR_1 == inactiveReservoir )
     {
         setValveStateDelayed( VRD1, VALVE_STATE_OPEN, DELAY_RES_DRAIN_VALVE_MS );
@@ -295,6 +297,8 @@
         acidBottleVolML   = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidFullBottleVolumeML;
         bicarbBottleVolML = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbStartVolumeML;
 
+        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_INACTIVE_RESERVOIR_TEMP_REMOVE, (U32)inactiveReservoir, 0 ) // TODO remove
+
         if ( DG_RESERVOIR_1 == inactiveReservoir )
         {
             setValveState( VRD1, VALVE_STATE_CLOSED );
@@ -360,6 +364,8 @@
 
     if ( ++drainEmptyTareTimerCtr > DRAIN_EMPTY_TARE_WAIT )
     {
+        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_INACTIVE_RESERVOIR_TEMP_REMOVE, (U32)inactiveReservoir, 0 ) // TODO remove
+
         drainEmptyTareTimerCtr = 0;
         tareLoadCellsAtEmpty( inactiveReservoir );
 
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rf10c653a13f97ae3d220e16f7ff1a9558606b56a -r4ebe73f0dee4b70eeea3c38a01e13f3b6817e366
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f10c653a13f97ae3d220e16f7ff1a9558606b56a)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4ebe73f0dee4b70eeea3c38a01e13f3b6817e366)
@@ -80,7 +80,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.