Index: NVDataMgmt.c
===================================================================
diff -u -rcb5aa97fea95ab79397d1c3b420cff346c767161 -reb638340e4909e12164e37259bc3f154e1a8d823
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision cb5aa97fea95ab79397d1c3b420cff346c767161)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision eb638340e4909e12164e37259bc3f154e1a8d823)
@@ -2477,7 +2477,7 @@
                 writtenRecordStatus = NVDATAMGMT_RECORD_NOT_CHECKED;
 
                 // Issue the write command
-                Fapi_issueProgrammingCommand( (U32*)memoryPtr, structPtr, jobSpecs.maxWriteBufferSize, 0x00, 0, Fapi_DataOnly );
+                Fapi_issueProgrammingCommand ( (U32*)memoryPtr, structPtr, jobSpecs.maxWriteBufferSize, 0x00, 0, Fapi_DataOnly );
             }
         }
     }
@@ -3384,12 +3384,14 @@
         dgServiceGroup.dgServiceRecord.serviceIntervalSeconds = RECORD_DEFAULT_SERVICE_INTERVAL_S;
         // Recalculate the CRC with the default values
         dgServiceGroup.dgServiceRecord.crc = crc16 ( (U08*)&dgServiceGroup.dgServiceRecord, sizeof(DG_SERVICE_RECORD_T) - sizeof(U16) );
-
+#ifndef DISABLE_SERVICE_RECORD
         // Service record failure is also considered as RTC RAM failure
         activateAlarmNoData( ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC );
 
+
         // Set the to FALSE since the record is not valid
         status = FALSE;
+#endif
     }
 
     return status;