Index: firmware/App/HDCommon.h
===================================================================
diff -u -r3533955f242cec0505e8826e0e2d96f7b79ad499 -r9ae2110044fcacd2152246dfdafcc69c23b54660
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 3533955f242cec0505e8826e0e2d96f7b79ad499)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 9ae2110044fcacd2152246dfdafcc69c23b54660)
@@ -25,7 +25,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        5
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        9033
+#define HD_VERSION_BUILD        9035
 
 // ********** development build switches **********
 
@@ -50,8 +50,8 @@
     #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
     #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
     #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
-    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
-//    #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
+//    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
+    #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
 //    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
@@ -66,14 +66,16 @@
     #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
     #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 //    #define V1_5_SYSTEM                     1           // Build for v1.5 system
-    #define V2_0_SYSTEM                     1           // Build for v2.0 system
+//    #define V2_0_SYSTEM                     1           // Build for v2.0 system
     #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
     #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
     #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
     #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
 //    #define DISABLE_BATT_COMM               1           // Disable battery communication.
     #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
     #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
+    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
+    #define SKIP_EMPTY_RES_CHECK            1           // Skip reservoir empty check
     #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
 
     #include <stdio.h>