Index: firmware/App/HDCommon.h
===================================================================
diff -u -r99ae9501d9c63efa9f624574b5b324d86c0b3c1b -r14fe5867a4db9f264880631cf0cfabefd995ec47
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 99ae9501d9c63efa9f624574b5b324d86c0b3c1b)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 14fe5867a4db9f264880631cf0cfabefd995ec47)
@@ -39,7 +39,7 @@
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
     #define DISABLE_ALARM_AUDIO             1           // Disable alarm audio
     #define SKIP_POST                       1           // Skip POST tests - all pass
-    #define DONT_SKIP_NV_POST               1           // Do not skip NV Data POST
+//    #define DONT_SKIP_NV_POST               1           // Do not skip NV Data POST
 //    #define USE_LIBRARY_TIME_FUNCTIONS      1           // Use the C library functions mktime() and gmtime() for epoch<=>date conversions
     #define DISABLE_AIR_TRAP_LEVELING_ALARM 1           // Disable air trap level control alarms
 //    #define DISABLE_3WAY_VALVES             1           // Disable 3-way valves
@@ -66,8 +66,8 @@
 //    #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_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 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.