Index: firmware/App/HDCommon.h
===================================================================
diff -u -reebdbc2325c1a8e38df643c61dcc7478f6179197 -r2e21b8a4e52e0d1f94389acf424b5033362b63f1
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision eebdbc2325c1a8e38df643c61dcc7478f6179197)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 2e21b8a4e52e0d1f94389acf424b5033362b63f1)
@@ -37,9 +37,9 @@
 //    #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
-    #define DISABLE_ALARM_AUDIO             1           // Disable alarm audio
-    #define SKIP_POST                       1           // Skip POST tests - all pass
-    #define IGNORE_CAL_TIMESTAMP            1           // Ignores calibration time stamp by setting an epoch time temporarily
+//    #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 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
@@ -48,14 +48,13 @@
 //    #define DISABLE_CRC_ERROR               1           // Do not error on bad CRC for CAN messages
 //    #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
     #define DISABLE_MOTOR_CURRENT_CHECKS    1           // Do not error on HD pump current checks
-    #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_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_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
-    #define DISABLE_CAL_CHECK               1           // Disable calibration checks
     #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
 //    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
     #define SKIP_CAL_CHECK               1
@@ -65,8 +64,6 @@
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
     #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 V2_0_SYSTEM                     1           // Build for v2.0 system
     #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.
@@ -77,7 +74,7 @@
     #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps
     #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
-    #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
+//    #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
     // Skip Pre-Treatment and get to treatment as soon as possible
 //    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
@@ -117,8 +114,33 @@
     U08 fpgaMajor;
     U08 fpgaMinor;
     U08 fpgaLab;
+    U32 compatibilityRev;
 } HD_VERSIONS_T;
 
+/// DG version struct.
+typedef struct
+{
+    U08 major;                              ///< DG version major revision
+    U08 minor;                              ///< DG version major revision
+    U08 micro;                              ///< DG version micro revision
+    U16 build;                              ///< DG build version
+    U08 fpgaId;                             ///< DG FPGA ID
+    U08 fpgaMajor;                          ///< DG FPGA major revision
+    U08 fpgaMinor;                          ///< DG FPGA minor revision
+    U08 fpgaLab;                            ///< DG FPGA lab revision
+    U32 compatibilityRev;                   ///< DG compatibility revision
+} DG_VERSIONS_T;
+
+/// Record defining the fields in a UI version request message.
+typedef struct
+{
+    U08                 major;                      ///< Major version for UI software
+    U08                 minor;                      ///< Minor version for UI software
+    U08                 micro;                      ///< Micro version for UI software
+    U16                 build;                      ///< Build number for UI software
+    U32                 compatibility;              ///< Compatibility revision
+} UI_VERSIONS_T;
+
 /// Payload record structure for a peristaltic pump data message.
 typedef struct
 {