Index: firmware/App/DDCommon.h
===================================================================
diff -u -r445cfa2348b9fa0610e35475d63a1f008e2d6750 -ra9432a08fba2911e7cf8bc62b0238aa0fd261445
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 445cfa2348b9fa0610e35475d63a1f008e2d6750)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision a9432a08fba2911e7cf8bc62b0238aa0fd261445)
@@ -25,7 +25,7 @@
 #define DD_VERSION_MAJOR    0
 #define DD_VERSION_MINOR    0
 #define DD_VERSION_MICRO    0
-#define DD_VERSION_BUILD    14
+#define DD_VERSION_BUILD    27
 
 // ********** development build switches **********
 
@@ -45,16 +45,15 @@
 //Uncomment below once characterization/study completed
 //#define ENABLE_ALARM_2
 
+//Uncomment below to disable heaters debug message
+#define __HEATERS_DEBUG__         1
+
 //Uncomment below for spent chamber filling
 //#define __SPENT_CHAMBER_FILL__    1
 
 //Uncomment below for bicarb chamber filling
 //#define __BICARB_CHAMBER_FILL__   1
 
-//Uncomment below to disable heaters debug message
-#define __HEATERS_DEBUG__         1
-
-
     #include <stdio.h>
     #include <strings.h>
 #endif
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r7d24ef2e6a4130b3a049e6106a0371fc6503271f -ra9432a08fba2911e7cf8bc62b0238aa0fd261445
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 7d24ef2e6a4130b3a049e6106a0371fc6503271f)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision a9432a08fba2911e7cf8bc62b0238aa0fd261445)
@@ -163,9 +163,6 @@
     { MSG_ID_FW_VERSIONS_REQUEST,                                                   &handleVersionRequestMessage },
     { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                                   &testSetResetSafetyShutdownOverride },
     { MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST,                                   &testDDUFDataPublishIntervalOverride },
-    { MSG_ID_DD_SET_TEST_CONFIGURATION,                                             &testSetTestConfiguration },
-    { MSG_ID_DD_GET_TEST_CONFIGURATION,                                             &testGetTestConfiguration },
-    { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS,                                      &testResetAllTestConfigurations },
     { MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST,                     &testDDSpentChamberFillDataPublishIntervalOverride },
     { MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testBloodLeakDataPublishIntervalOverride },
     { MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST,                                 &testBloodLeakStatusOverride },
@@ -174,6 +171,9 @@
     { MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST,                     &testBloodLeakEmbeddedModeInfoOverride },
     { MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST,               &testBloodLeakIntensityMovingAverageOverride },
     { MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST,                 &testBloodLeakZeroingIntervalInMillisecondsOverride },
+    { MSG_ID_DD_SET_TEST_CONFIGURATION,                                             &testSetTestConfiguration },
+    { MSG_ID_DD_GET_TEST_CONFIGURATION,                                             &testGetTestConfiguration },
+    { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS,                                      &testResetAllTestConfigurations },
     { MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST,                                            &testBloodLeakZeroSequenceRequest }
 };