Index: firmware/App/HDCommon.h
===================================================================
diff -u -r4154d8c971b3fcb591a5447a02e3cb0ffe067f63 -r92f7c02937118d6cdf2df95deda12d6a42fb4736
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 4154d8c971b3fcb591a5447a02e3cb0ffe067f63)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 92f7c02937118d6cdf2df95deda12d6a42fb4736)
@@ -64,18 +64,18 @@
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
     #define ALARM_VOLUME_DEFAULT_LOW        1           // Set default alarm volume to lowest
 //    #define TEMP_UI_ALARM_SILENCE_FIX       1           // Temporary UI fix for handling alarm silence request msg
-//    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
     #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 //    #define V2_0_SYSTEM                     1           // Build for v2.0 system
-//    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
+    #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 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
     #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute