Index: firmware/App/HDCommon.h
===================================================================
diff -u -r596bd7a39e90c4ca7264f463031534373af0b315 -r40f46e196349e3dd730048a354df8bbb2e40407d
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 596bd7a39e90c4ca7264f463031534373af0b315)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
@@ -37,6 +37,7 @@
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
+    // TODO convert the new configuration way
     #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
@@ -85,14 +86,14 @@
     #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
     #define DISABLE_ILLEGAL_AIR_TRAP_ALARM  1           // Disable illegal state for air trap alarm
     #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms
-    #define IGNORE_BLOOD_LEAK_SELF_TEST     1           // Ignore blood leak self test
-    #define IGNORE_BLOOD_LEAK_ALARM         1           // Ignore blood leak alarm
+//    #define IGNORE_BLOOD_LEAK_SELF_TEST     1           // Ignore blood leak self test                // TODO New config implemented
+//    #define IGNORE_BLOOD_LEAK_ALARM         1           // Ignore blood leak alarm                    // TODO New config implemented
     #define DISABLE_SERVICE_RECORD 1
 
     // Skip Pre-Treatment and get to treatment as soon as possible
-    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
-    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
-    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
+    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.                         // TODO New config implemented
+    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water              // TODO New config implemented
+    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests     // TODO New config implemented
     #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
     #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
     #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests