Index: NVDataMgmt.c
===================================================================
diff -u -r7574a250df6c0a773344ccafb62431c22930f6a3 -rf9825c615dd8134ab9470b6d88cc2947034ca681
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 7574a250df6c0a773344ccafb62431c22930f6a3)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision f9825c615dd8134ab9470b6d88cc2947034ca681)
@@ -1666,12 +1666,14 @@
         SEND_EVENT_WITH_2_U32_DATA( RECORDS_SPECS[ NVDATAMGMT_SERVICE_RECORD ].nvEvent, 0, 0 )
     }
 
+#ifndef _RELEASE_
     if ( FALSE == hasSWConfigRecordPassed )
     {
         enqueueRecordJob( NVDATAMGMT_WRITE, RECORDS_SPECS[ NVDATAMGMT_SW_CONFIG_RECORD ].dataLoc, NVDATAMGMT_SW_CONFIG_RECORD );
         SEND_EVENT_WITH_2_U32_DATA( RECORDS_SPECS[ NVDATAMGMT_SW_CONFIG_RECORD ].nvEvent, 0, 0 )
 
     }
+#endif
 
     if ( FALSE == hasUsageRecordPassed )
     {
Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r0449eddfe77b6253baae6ce89afb4674cacef92a -rf9825c615dd8134ab9470b6d88cc2947034ca681
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 0449eddfe77b6253baae6ce89afb4674cacef92a)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision f9825c615dd8134ab9470b6d88cc2947034ca681)
@@ -31,13 +31,13 @@
 
 // ********** public definitions **********
 
-#define MAX_TOP_LEVEL_PN_CHARS                    10U                                                           ///< Max number of characters for top level part number.
-#define MAX_TOP_LEVEL_SN_CHARS                    20U                                                           ///< Max number of characters for top level serial number.
-#define PRES_SENSORS_RESERVED_SPACE_COUNT         5                                                             ///< Pressure sensors reserved space count.
-#define FLOW_SENSROS_RESERVED_SPACE_COUNT         2                                                             ///< Flow sensors reserved space count.
-#define TEMP_SENSORS_RESERVED_SPACE_COUNT         2                                                             ///< Temperature sensors reserved space count.
-#define COND_SENSORS_RESERVED_SPACE_COUNT         2                                                             ///< Conductivity sensors reserved space count.
-#define GENERIC_VOL_RESERVED_SPACE_COUNT          4                                                             ///< Generic volumes reserved space count.
+#define MAX_TOP_LEVEL_PN_CHARS                    10U                                                          ///< Max number of characters for top level part number.
+#define MAX_TOP_LEVEL_SN_CHARS                    20U                                                          ///< Max number of characters for top level serial number.
+#define PRES_SENSORS_RESERVED_SPACE_COUNT         5                                                            ///< Pressure sensors reserved space count.
+#define FLOW_SENSROS_RESERVED_SPACE_COUNT         2                                                            ///< Flow sensors reserved space count.
+#define TEMP_SENSORS_RESERVED_SPACE_COUNT         2                                                            ///< Temperature sensors reserved space count.
+#define COND_SENSORS_RESERVED_SPACE_COUNT         2                                                            ///< Conductivity sensors reserved space count.
+#define GENERIC_VOL_RESERVED_SPACE_COUNT          4                                                            ///< Generic volumes reserved space count.
 
 #ifndef _RELEASE_
 /// Software configuration enums