Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -re2406180bf569fb495b709542c12da099c8e23ea -r807793aa9504244b0b801fa2c3a09e92f8abf3fe
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision e2406180bf569fb495b709542c12da099c8e23ea)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 807793aa9504244b0b801fa2c3a09e92f8abf3fe)
@@ -22,7 +22,7 @@
 
 /**
  *  @defgroup ROPump ROPump
- *  @brief RO Pump monitor and controller module.  Controls and monitors the RO pump.
+ *  @brief RO Pump monitor and controller module.  Controls and monitors the RO pump and the flow meter.
  *  The flow meter is manufactured by SwissFlow, PN: 82015311.
  *  The diaphragm (RO) pump is manufactured by Aquatec, PN: 5889-2MM1-V724DY.
  *
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rf62ad14b34df363aaf82e3d0272471a402fadc9f -r807793aa9504244b0b801fa2c3a09e92f8abf3fe
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f62ad14b34df363aaf82e3d0272471a402fadc9f)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 807793aa9504244b0b801fa2c3a09e92f8abf3fe)
@@ -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.