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
Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r33643a3ab1bcec2cd9b71e2977cb7c40750229c0 -rafb0fcafdbfe0b57b79c330e37b504b8acc2b137
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 33643a3ab1bcec2cd9b71e2977cb7c40750229c0)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision afb0fcafdbfe0b57b79c330e37b504b8acc2b137)
@@ -38,27 +38,29 @@
 /// Software configuration enums
 typedef enum software_configurations
 {
-    SW_CONFIG_DISABLE_HEATERS_AND_TEMPS = 0,
+    SW_CONFIG_DISABLE_TRIMMER_HEATER = 0,
     SW_CONFIG_DISABLE_ACCELS,
     SW_CONFIG_DISABLE_CAL_CHECK,                                                                               ///< Software configuration disable calibration check.
     SW_CONFIG_DISABLE_HEATERS_MONITOR,                                                                         ///< Software configuration disable heaters monitor.
-    SW_CONFIG_DISBALE_DRAIN_PUMP_MONITOR,
+    SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR,
     SW_CONFIG_DISABLE_RO_PUMP_MONITOR,                                                                         ///< Software configuration disable RO pump monitor.
     SW_CONFIG_DISABLE_RO_RATIO_CHECK,                                                                          ///< Software configuration disable RO ratio check
     SW_CONFIG_DISABLE_COND_SENSOR_CHECK,                                                                       ///< Software configuration disable conductivity sensor check.
-    SW_CONFIG_DISBALE_WATER_QAULITY_CHECK,
-    SW_CONFIG_DISBALE_FLOW_LOAD_CELL_CHECK_IN_FILL,
+    SW_CONFIG_DISABLE_WATER_QUALITY_CHECK,
+    SW_CONFIG_DISABLE_FLOW_VS_LOAD_CELL_CHECK_IN_FILL,
     SW_CONFIG_DISABLE_HEATERS_EFFICIENCY,
-    SW_CONFIG_DISBALE_DISINFECT_CONDUCTIVITY_CHECK,
+    SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK,
+    SW_CONFIG_DISABLE_CONC_PUMPS,
     SW_CONFIG_DISABLE_CAPS_MONITOR,
-    SW_CONFIG_DISBALE_UV_REACTORS,
+    SW_CONFIG_DISABLE_UV_REACTORS,
     SW_CONFIG_DISABLE_ACID_ALARMS,
     SW_CONFIG_DISABLE_BICARB_ALARMS,
     SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM,
     SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST,
     SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST,
-    SW_CONFIG_DISABLE_DIALYSATE_CHECK,
+    SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM,
     SW_CONFIG_DISABLE_MIXING_IN_FILL,
+    SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM,
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
 #endif
Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -rdc1d000cbaab94b3649828376325bf23c44671a1 -rafb0fcafdbfe0b57b79c330e37b504b8acc2b137
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision dc1d000cbaab94b3649828376325bf23c44671a1)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision afb0fcafdbfe0b57b79c330e37b504b8acc2b137)
@@ -80,6 +80,7 @@
     SW_CONFIG_ENABLE_BLOOD_PUMP_OPEN_LOOP,
     SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP,
     SW_CONFIG_DISABLE_SWITCHES_MONITOR,                                                                        ///< Software configuration disable switches monitor.
+    SW_CONFIG_ENABLE_VAB_SPECIAL_POSITION_C,
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
 #endif