Index: NVDataMgmt.c
===================================================================
diff -u -r16e07fd8c44f6e3a8a106fc8a4190f37f32d24d2 -rafb0fcafdbfe0b57b79c330e37b504b8acc2b137
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 16e07fd8c44f6e3a8a106fc8a4190f37f32d24d2)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision afb0fcafdbfe0b57b79c330e37b504b8acc2b137)
@@ -1217,9 +1217,21 @@
         }
         else
         {
-            activateAlarmNoData( nvAlarm );
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAL_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                activateAlarmNoData( nvAlarm );
+            }
+#ifndef _RELEASE_
+            else
+            {
+                isNVDataValid = TRUE;
+            }
+#endif
         }
     }
+
 #else
     isNVDataValid = TRUE;
 #endif