Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r3b84fc79b2fd6c7a447e54e4fe821447f613af59 -rbe1ff666dbd2ff03342c22c8e50b21d0f9b988a9
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 3b84fc79b2fd6c7a447e54e4fe821447f613af59)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision be1ff666dbd2ff03342c22c8e50b21d0f9b988a9)
@@ -125,6 +125,20 @@
     { MSG_ID_DD_SOFTWARE_RESET_REQUEST,                                             &handleDDSoftwareResetRequest },
     { MSG_ID_TD_OP_MODE_DATA,                                                       &handleSetTDOperationMode },
     { MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE,                                        &handleUpdateAvailable },
+    { MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST,                                          &handleDDGetNVRecord },
+    { MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST,                                   &handleDDSetNVSystemRecord },
+    { MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST,                                  &handleDDSetNVServiceRecord },
+    { MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD_REQUEST,                            &handleDDSetNVInstitutionalRecord },
+    { MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST,                               &handleDDSetNVUsageInfoRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR_REQUEST,                             &handleDDSetPressureSensorCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR_REQUEST,                                 &handleDDSetTempSensorCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST,                                   &handleDDSetConcPumpCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST,                                    &handleDDSetD12PumpCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP_REQUEST,                                    &handleDDSetD48CalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE_REQUEST,                            &handleDDSetAcidConcCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE_REQUEST,                          &handleDDSetBicarbConcCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR_REQUEST,                                &handleDDSetAccelSensorCalRecord },
+    { MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_REQUEST,                           &handleDDSetBloodLeakSensorCalRecord },
     { MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                            &testValvesStatesPublishIntervalOverride },
     { MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST,                                       &testValveStateOverride },
     { MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST,                                &testValveSensedStateOverride },
@@ -262,21 +276,7 @@
     { 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_UI_DD_NVM_GET_RECORD_REQUEST,                                          &testDDGetNVRecord },
-    { MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST,                                   &testDDSetNVSystemRecord },
-    { MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST,                                  &testDDSetNVServiceRecord },
-    { MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD_REQUEST,                            &testDDSetNVInstitutionalRecord },
-    { MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST,                               &testDDSetNVUsageInfoRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR_REQUEST,                             &testDDSetPressureSensorCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR_REQUEST,                                 &testDDSetTempSensorCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST,                                   &testDDSetConcPumpCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST,                                    &testDDSetD12PumpCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP_REQUEST,                                    &testDDSetD48CalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE_REQUEST,                            &testDDSetAcidConcCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE_REQUEST,                          &testDDSetBicarbConcCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR_REQUEST,                                &testDDSetAccelSensorCalRecord },
-    { MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_REQUEST,                           &testDDSetBloodLeakSensorCalRecord },
-    { MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST,                                    &testDDSetNVUsageInfoRecord },
+    { MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST,                                    &testSetNVRecordCRCOverride },
     { 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 },