Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r0face6417892ea9de28d146bf88d44a9f30cf2a4 -r6d1ea33dbe56d63b13802cacd09c263a5ee7e6e0
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0face6417892ea9de28d146bf88d44a9f30cf2a4)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 6d1ea33dbe56d63b13802cacd09c263a5ee7e6e0)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+
 #include <string.h>        // for memcpy()
 
 #include "reg_system.h"
@@ -46,7 +47,7 @@
 #include "ModePreGenPermeateDefeatured.h"
 #include "ModePostGenDialysate.h"
 #include "ModeStandby.h"
-#include "NVMsgQ.h"
+#include "NVMessaging.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #include "PermeateTank.h"
@@ -273,6 +274,7 @@
     { MSG_ID_DD_NVM_SET_CALIBRATION_RECORD,                                         &testDDSetNVCalibrationRecord },
     { MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD,                                       &testDDSetNVInstitutionalRecord },
     { MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD,                                          &testDDSetNVUsageInfoRecord },
+    { MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST,                                    &testDDSetNVUsageInfoRecord },
     { 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 },