Index: NVDataMgmt.c
===================================================================
diff -u -rc57cfc34f4691eae24a420bc3fa64bc55ec5c11a -r9f5e51e4a0fe46d8addedd27d3757a947f3f0bea
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision c57cfc34f4691eae24a420bc3fa64bc55ec5c11a)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 9f5e51e4a0fe46d8addedd27d3757a947f3f0bea)
@@ -456,12 +456,12 @@
   {CAL_RECORD_NV_MEM_START_ADDRESS,     sizeof(DG_CALIBRATION_RECORD_T),    MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(DG_CALIBRATION_RECORD_T), (U08*)&dgCalibrationRecord,  (U08*)&dgCalibrationRecord.crc,   NVDATAMGMT_EEPROM,  DG_EVENT_CAL_RECORD_UPDATE },       // NVDATAMGMT_CALIBRATION_RECORD
   {SYSTEM_RECORD_NV_MEM_START_ADDRESS,  sizeof(DG_SYSTEM_GROUP_T),          MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(DG_SYSTEM_GROUP_T),       (U08*)&dgSystemGroup,        (U08*)&dgSystemGroup.crc,         NVDATAMGMT_EEPROM,  DG_EVENT_SYSTEM_RECORD_UPDATE },    // NVDATAMGMT_SYSTEM_RECORD
   {SERVICE_RECORD_NV_MEM_START_ADDRESS, sizeof(DG_SERVICE_GROUP_T),         MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(DG_SERVICE_GROUP_T),      (U08*)&dgServiceGroup,       (U08*)&dgServiceGroup.crc,        NVDATAMGMT_EEPROM,  DG_EVENT_SERVICE_UPDATE },          // NVDATAMGMT_SERVICE_RECORD
-#ifndef _RELEASE_
-  {SW_CONFIGS_START_ADDRESS,            sizeof(DG_SW_CONFIG_GROUP_T),       MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgSWConfigGroup,      (U08*)&dgSWConfigGroup.crc,       NVDATAMGMT_RTC,     DG_EVENT_SW_CONFIG_UPDATE },        // NVDATAMGMT_SW_CONFIG_RECORD
-#endif
   {DG_SCHEDULED_RUNS_START_ADDRESS,     sizeof(DG_SCHEDULED_RUNS_GROUP_T),  MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgScheduledRunsGroup, (U08*)&dgScheduledRunsGroup.crc,  NVDATAMGMT_RTC,     DG_EVENT_SCHEDULED_RUNS_UPDATE },   // NVDATAMGMT_SCHEDULER_RECORD
   {DG_HEATERS_INFO_START_ADDRESS,       sizeof(DG_HEATERS_INFO_GROUP_T),    MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgHeatersInfoGroup,   (U08*)&dgHeatersInfoGroup.crc,    NVDATAMGMT_RTC,     DG_EVENT_HEATERS_INFO_UPDATE },     // NVDATAMGMT_HEATERS_INFO_RECORD
-  {DG_USAGE_INFO_START_ADDRESS,         sizeof(DG_USAGE_INFO_GROUP_T),      MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgUsageInfoGroup,     (U08*)&dgUsageInfoGroup.crc,      NVDATAMGMT_RTC,     DG_EVENT_USAGE_INFO_UPDATE }        // NVDATAMGMT_USAGE_INFO_RECORD
+  {DG_USAGE_INFO_START_ADDRESS,         sizeof(DG_USAGE_INFO_GROUP_T),      MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgUsageInfoGroup,     (U08*)&dgUsageInfoGroup.crc,      NVDATAMGMT_RTC,     DG_EVENT_USAGE_INFO_UPDATE },       // NVDATAMGMT_USAGE_INFO_RECORD
+#ifndef _RELEASE_
+  {SW_CONFIGS_START_ADDRESS,            sizeof(DG_SW_CONFIG_GROUP_T),       MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgSWConfigGroup,      (U08*)&dgSWConfigGroup.crc,       NVDATAMGMT_RTC,     DG_EVENT_SW_CONFIG_UPDATE }         // NVDATAMGMT_SW_CONFIG_RECORD
+#endif
 };
 #endif
 
@@ -479,10 +479,10 @@
   {CAL_RECORD_NV_MEM_START_ADDRESS,     sizeof(HD_CALIBRATION_RECORD_T), MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_CALIBRATION_RECORD_T), (U08*)&hdCalibrationRecord, (U08*)&hdCalibrationRecord.crc, NVDATAMGMT_EEPROM,  HD_EVENT_CAL_RECORD_UPDATE },             // NVDATAMGMT_CALIBRATION_RECORD
   {SYSTEM_RECORD_NV_MEM_START_ADDRESS,  sizeof(HD_SYSTEM_GROUP_T),       MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_SYSTEM_GROUP_T),       (U08*)&hdSystemGroup,       (U08*)&hdSystemGroup.crc,       NVDATAMGMT_EEPROM,  HD_EVENT_SYSTEM_RECORD_UPDATE },          // NVDATAMGMT_SYSTEM_RECORD
   {SERVICE_RECORD_NV_MEM_START_ADDRESS, sizeof(HD_SERVICE_GROUP_T),      MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_SERVICE_GROUP_T),      (U08*)&hdServiceGroup,      (U08*)&hdServiceGroup.crc,      NVDATAMGMT_EEPROM,  HD_EVENT_SERVICE_UPDATE },                // NVDATAMGMT_PROCESS_LAST_SERVICE_RECORD
+  {HD_USAGE_INFO_START_ADDRESS,         sizeof(HD_USAGE_INFO_GROUP_T),   MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&hdUsageInfoGroup,    (U08*)&hdUsageInfoGroup.crc,    NVDATAMGMT_RTC,     HD_EVENT_USAGE_INFO_UPDATE },             // NVDATAMGMT_USAGE_INFO
 #ifndef _RELEASE_
-  {SW_CONFIGS_START_ADDRESS,            sizeof(HD_SW_CONFIG_GROUP_T),    MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&hdSWConfigGroup,     (U08*)&hdSWConfigGroup.crc,     NVDATAMGMT_RTC,     HD_EVENT_SW_CONFIG_UPDATE },              // NVDATAMGMT_SW_CONFIG_RECORD
+  {SW_CONFIGS_START_ADDRESS,            sizeof(HD_SW_CONFIG_GROUP_T),    MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&hdSWConfigGroup,     (U08*)&hdSWConfigGroup.crc,     NVDATAMGMT_RTC,     HD_EVENT_SW_CONFIG_UPDATE }               // NVDATAMGMT_SW_CONFIG_RECORD
 #endif
-  {HD_USAGE_INFO_START_ADDRESS,         sizeof(HD_USAGE_INFO_GROUP_T),   MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&hdUsageInfoGroup,    (U08*)&hdUsageInfoGroup.crc,    NVDATAMGMT_RTC,     HD_EVENT_USAGE_INFO_UPDATE },             // NVDATAMGMT_USAGE_INFO
 };
 #endif