Index: firmware/App/DGCommon.h
===================================================================
diff -u -r6225c12de69db32e83c9d1f55fbabca3e7e32a3a -r2b60564ac818a6692b714dfd9920d2e2fcf0937d
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 6225c12de69db32e83c9d1f55fbabca3e7e32a3a)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 2b60564ac818a6692b714dfd9920d2e2fcf0937d)
@@ -25,7 +25,7 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        16
+#define DG_VERSION_BUILD        81
 
 // ********** build switches **********
 
@@ -34,7 +34,7 @@
 // TODO: Removed debug build flags when release build is ready
 //    #define BOARD_WITH_NO_HARDWARE          1
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
-//    #define DISABLE_HEATERS_AND_TEMPS       1
+//   #define DISABLE_HEATERS_AND_TEMPS       1
 //    #define DISABLE_ACCELS                  1
 //    #define SKIP_POST                       1
     #define SKIP_CAL_CHECK               1
@@ -48,15 +48,18 @@
     #define IGNORE_RO_PUMP_MONITOR          1
     #define DISABLE_RO_RATIO_CHECK          1
 //    #define DISABLE_COND_SENSOR_CHECK       1
-//    #define DISABLE_WATER_QUALITY_CHECK     1
+    #define DISABLE_WATER_QUALITY_CHECK     1
     #define DISABLE_RTC_CONFIG              1
     #define THD_USING_TRO_CONNECTOR         1
+    #define DISABLE_FLOW_CHECK_IN_FILL      1
     #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1
 
     // Turn these flags on to disable dialysate mixing
     #define DISABLE_DIALYSATE_CHECK         1
     #define DISABLE_MIXING                  1
     //#define DISABLE_FLOW_CONTROL_TREATMENT  1
+    #define DISABLE_TRIMMER_HEATER 1
+    #define DIALYSATE_FLOW_METER_ENABLED    1
     #define DISABLE_ACK_ALARM 1
 
     #include <stdio.h>