Index: firmware/App/DGCommon.h
===================================================================
diff -u -r9f5d2ce00deb3121935f43ea3824824576ca92da -r9aae9f4b996e87e2f6d381b00d5ee1cfdf333429
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 9f5d2ce00deb3121935f43ea3824824576ca92da)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 9aae9f4b996e87e2f6d381b00d5ee1cfdf333429)
@@ -25,7 +25,7 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        19
+#define DG_VERSION_BUILD        141
 
 // ********** build switches **********
 
@@ -55,6 +55,7 @@
     #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1          // Not needed
 //    #define NEW_FMD_FLOW_SENSOR             1            // Not needed
     #define DISABLE_HEATERS_EFFICIENCY      1
+
     #define DISABLE_DISINFECT_CONDUCTIVITY 1           // Implement
     #define DISABLE_CONC_PUMPS             1
 //    #define DISABLE_CAP_SWITCHES            1           // Implement
@@ -95,6 +96,7 @@
     U08 fpgaMajor;                          ///< DG FPGA major revision
     U08 fpgaMinor;                          ///< DG FPGA minor revision
     U08 fpgaLab;                            ///< DG FPGA lab revision
+    U32 compatibilityRev;                   ///< DG compatibility revision
 } DG_VERSIONS_T;
 #pragma pack(pop)
 
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rb8a409a6f04c2912cb20eb4c9191bff573080162 -r9aae9f4b996e87e2f6d381b00d5ee1cfdf333429
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision b8a409a6f04c2912cb20eb4c9191bff573080162)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 9aae9f4b996e87e2f6d381b00d5ee1cfdf333429)
@@ -49,14 +49,15 @@
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                             ///< Time period of unchanged weight during draining before timeout.
 
 // Flush drain path state defines
-#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
+#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * 60 * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds.
 
 // Flush dialysate state defines
 #define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5F * 60 * MS_PER_SECOND )                     ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
 #define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5F * 60 * MS_PER_SECOND )                     ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
 #define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0F                                            ///< Acid pump speed in mL/min.
+
 // The bicarb pump is 2% faster than the acid pump to create a flow from acid to bicarb line during flush
 #define BICARB_PUMP_SPEED_ML_PER_MIN                30.6F                                             ///< Bicarb pump speed in mL/min.
 
@@ -306,6 +307,7 @@
 
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
+
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );