Index: AlarmDefs.h
===================================================================
diff -u -r70e6478104c7b170f927d2b71b0252499f3a2694 -r97ad095b2d54c1c3f865c27b483d79eccd14df25
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 70e6478104c7b170f927d2b71b0252499f3a2694)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 97ad095b2d54c1c3f865c27b483d79eccd14df25)
@@ -269,7 +269,7 @@
     ALARM_ID_DD_NVM_INVALID_INSTIT_ADVANCED_RECORD_CRC              = 237,  ///< DD invalid advanced institutional record
     ALARM_ID_DD_NVM_INVALID_INSTIT_ADDITIONAL_RECORD_CRC            = 238,  ///< DD invalid additional institutional record
     ALARM_ID_FP_NVM_INVALID_SERVICE_RECORD_CRC                      = 239,  ///< FP invalid serivice record
-    ALARM_ID_FP_NVM_INVALID_USAGE_RECORD_CRC                        = 239,  ///< FP invalid usage record
+    ALARM_ID_FP_NVM_INVALID_USAGE_RECORD_CRC                        = 240,  ///< FP invalid usage record
     NUM_OF_ALARM_IDS                                                        ///< Number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                         ///< Type for alarm list enumeration
Index: MsgDefs.h
===================================================================
diff -u -rf1ea8c059d08b9b35032affefe4c48f6726b3dbd -r97ad095b2d54c1c3f865c27b483d79eccd14df25
--- MsgDefs.h	(.../MsgDefs.h)	(revision f1ea8c059d08b9b35032affefe4c48f6726b3dbd)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 97ad095b2d54c1c3f865c27b483d79eccd14df25)
@@ -283,6 +283,14 @@
     MSG_ID_DD_UI_NVM_GET_CONDUCTIVITY_SENSOR_CAL_RECORD_RESPONSE = 0x13D,           ///< DD NVM Get Conductivity Sensor Calibration Record Response
     MSG_ID_UI_DD_NVM_SET_CONDUCTIVITY_SENSOR_CAL_RECORD_REQUEST = 0x13E,            ///< DD NVM Set Conductivity Sensor Calibration Record Request
     MSG_ID_DD_UI_NVM_SET_CONDUCTIVITY_SENSOR_CAL_RECORD_RESPONSE = 0x13F,           ///< DD NVM Set Conductivity Sensor Calibration Record Response
+    MSG_ID_UI_FP_NVM_GET_SERVICE_RECORD_REQUEST = 0x140,                            ///< FP NVM Get Service Record Request
+    MSG_ID_FP_UI_NVM_GET_SERVICE_RECORD_RESPONSE = 0x141,                           ///< FP NVM Get Service Record Response
+    MSG_ID_UI_FP_NVM_SET_SERVICE_RECORD_REQUEST = 0x142,                            ///< FP NVM Set Service Record Request
+    MSG_ID_FP_UI_NVM_SET_SERVICE_RECORD_RESPONSE = 0x143,                           ///< FP NVM Set Service Record Response
+    MSG_ID_UI_FP_NVM_GET_USAGE_INFO_RECORD_REQUEST = 0x144,                         ///< FP NVM Get Usage Info Record Request
+    MSG_ID_FP_UI_NVM_GET_USAGE_INFO_RECORD_RESPONSE = 0x145,                        ///< FP NVM Get Usage Info Record Response
+    MSG_ID_UI_FP_NVM_SET_USAGE_INFO_RECORD_REQUEST = 0x146,                         ///< FP NVM Set Usage Info Record Request
+    MSG_ID_FP_UI_NVM_SET_USAGE_INFO_RECORD_RESPONSE = 0x147,                        ///< FP NVM Set Usage Info Record Response
 
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID