Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r290cac3c0557c978647cef2972800dfe137dd662 -r8e93771bd0894bf1308747d1e520d620d7821fab
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 290cac3c0557c978647cef2972800dfe137dd662)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 8e93771bd0894bf1308747d1e520d620d7821fab)
@@ -260,6 +260,12 @@
     { MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST,                            &testRinsePumpPWMPercentOverride },
     { MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST,                                     &testRinsePumpTurnOnOffRequest },
     { MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST,                                    &testSetGeneratePermeateSignal },
+    { MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDryBiCartDataPublishIntervalOverride },
+    { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,                         &testDryBiCartFillCycleMaxCountOverride },
+    { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,                           &testDryBiCartFillRequestOverride },
+    { MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST,                       &testBiCarbChamberFillRequestOverride },
+    { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
+    { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
     { MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testRORejectionRatioDataPublishIntervalOverride },
     { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
     { MSG_ID_FP_SET_TEST_CONFIGURATION,                                             &testSetTestConfiguration },
@@ -278,9 +284,6 @@
     { MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                      &testPreGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_STATUS_REQUEST,                                                 &testGetFPDefeaturedStatus },
-    { MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDryBiCartDataPublishIntervalOverride },
-    { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,                         &testDryBiCartFillCycleMaxCountOverride },
-    { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,                           &testDryBiCartFillRequestOverride },
     { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
     { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
     { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
@@ -744,6 +747,7 @@
     if ( message->hdr.payloadLen == sizeof( UI_VERSIONS_T ) )
     {
         DD_VERSIONS_T ddVersionRecord;
+        FP_VERSIONS_T fpVersionRecord;
 
         // Record UI version information
         memcpy( (U08*)(&uiVersionRecord), &message->payload, sizeof( UI_VERSIONS_T ) );
@@ -758,6 +762,17 @@
 
         // Send DD version information
         result = sendMessage( MSG_ID_DD_VERSION_RESPONSE, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&ddVersionRecord, sizeof( DD_VERSIONS_T ) );
+
+        // Build FP version record
+        fpVersionRecord.major            = DD_VERSION_MAJOR;
+        fpVersionRecord.minor            = DD_VERSION_MINOR;
+        fpVersionRecord.micro            = DD_VERSION_MICRO;
+        fpVersionRecord.build            = DD_VERSION_BUILD;
+        getFPGAVersions( &fpVersionRecord.fpgaId, &fpVersionRecord.fpgaMajor, &fpVersionRecord.fpgaMinor, &fpVersionRecord.fpgaLab );
+        fpVersionRecord.compatibilityRev = SW_COMPATIBILITY_REV;
+
+        // Send FP version information
+        result = sendMessage( MSG_ID_FP_VERSION_RESPONSE, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&fpVersionRecord, sizeof( FP_VERSIONS_T ) );
     }
 
     return result;