Index: firmware/App/Services/NVRecordsDD.c
===================================================================
diff -u -r7b414857790dd5282137bf67d56688a703d4bfe7 -r13e865e5849f939d1c413b55f7240bc047006996
--- firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision 7b414857790dd5282137bf67d56688a703d4bfe7)
+++ firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision 13e865e5849f939d1c413b55f7240bc047006996)
@@ -122,14 +122,6 @@
 
 // ********** DD record structures **********
 
-/// DD calibration group structure
-typedef struct
-{
-    DD_CALIBRATION_RECORD_T ddCalibrationRecord;                                ///< DD calibration groups.
-    U08 padding[ CALIBRATION_RECORD_PADDING_LENGTH ];                           ///< DD calibration record padding byte array.
-    U16 crc;                                                                    ///< CRC for the DG calibration record structure.
-} DD_CALIBRATION_GROUP_T;
-
 /// DD system group structure
 typedef struct
 {
@@ -146,6 +138,14 @@
     U16 crc;                                                                    ///< CRC for the DG service structure.
 } DD_SERVICE_GROUP_T;
 
+/// DD calibration group structure
+typedef struct
+{
+    DD_CALIBRATION_RECORD_T ddCalibrationRecord;                                ///< DD calibration groups.
+    U08 padding[ CALIBRATION_RECORD_PADDING_LENGTH ];                           ///< DD calibration record padding byte array.
+    U16 crc;                                                                    ///< CRC for the DG calibration record structure.
+} DD_CALIBRATION_GROUP_T;
+
 /// DD institutional group structure
 typedef struct
 {
@@ -424,11 +424,6 @@
         activateAlarmNoData( ALARM_ID_DD_NVM_INVALID_INSTITUTIONAL_RECORD_CRC );
     }
 
-    if ( FALSE == hasFPServiceRecordPassed )
-    {
-        activateAlarmNoData( ALARM_ID_FP_NVM_INVALID_SERVICE_RECORD_CRC );
-    }
-
     if ( FALSE == hasFPUsageRecordPassed )
     {
         activateAlarmNoData( ALARM_ID_FP_NVM_INVALID_USAGE_RECORD_CRC );
@@ -1254,7 +1249,7 @@
  *************************************************************************/
 static void initFPServiceRecord( void )
 {
-    ddServiceGroup.ddServiceRecord.fpRecord.waterRecovery                  = 0;
+    ddServiceGroup.ddServiceRecord.fpRecord.waterRecoveryMode              = 0;
     ddServiceGroup.ddServiceRecord.fpRecord.primaryFilterReplacementDate   = 0;
     ddServiceGroup.ddServiceRecord.fpRecord.secondaryFilterReplacementDate = 0;
     ddServiceGroup.ddServiceRecord.fpRecord.ROMembraneReplacementDate      = 0;