Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -r6d98aaf38c1fc7381611fd69959b0c9116f1be4f -r4a760dadd92723113afea5d2d8a9722a979a38e8
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 6d98aaf38c1fc7381611fd69959b0c9116f1be4f)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 4a760dadd92723113afea5d2d8a9722a979a38e8)
@@ -67,7 +67,7 @@
     SW_CONFIG_DISABLE_DRY_SELF_TESTS,                                                                          ///< Software configuration disable dry self tests.
     SW_CONFIG_DISABLE_PRIMING,                                                                                 ///< Software configuration disable priming.
     SW_CONFIG_DISABLE_WET_SELF_TEST,                                                                           ///< Software configuration disable wet self test.
-    SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR,                                                             ///< Software configuration enable DVT arterial pressure sensor.
+    SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL,                                                           ///< Software configuration enable wet self test wider volume tolerance.
     SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS,                                                                  ///< Software configuration disable ultrafiltration alarms.
     SW_CONFIG_DISABLE_BUBBLE_ALARMS,                                                                           ///< Software configuration disable bubble alarms.
     SW_CONFIG_DISABLE_ACCELEROMETERS,                                                                          ///< Software configuration disable accelerometers.
@@ -142,7 +142,7 @@
     CAL_DATA_HD_THERMISTOR_POWER_SUPPLY_1,                                                                      ///< Power supply 1 therimstor.
     CAL_DATA_HD_TEMPSENSOR_FPGA_BOARD,                                                                          ///< FPGA board temperature sensor.
     CAL_DATA_HD_TEMPSENSOR_VENOUS_PRESSURE,                                                                     ///< Venous pressure sensor temperature sensor.
-    CAL_DATA_HD_TEMPSENSOR_PBA_ADC,                                                                             ///< PBA ADC Temperature sensor.
+    CAL_DATA_HD_TEMPSENSOR_ARTERIAL_PRESSURE,                                                                   ///< Arterial pressure sensor temperature sensor.
     NUM_OF_CAL_DATA_HD_TEMP_SENSORS,                                                                            ///< Number of HD temperature sensors.
 } CAL_DATA_HD_TEMEPERATURE_SENSORS_T;
 
Index: PersistentAlarm.h
===================================================================
diff -u -rf74fbf44ae7855cb229e39278481cb9f57d6bcd8 -r4a760dadd92723113afea5d2d8a9722a979a38e8
--- PersistentAlarm.h	(.../PersistentAlarm.h)	(revision f74fbf44ae7855cb229e39278481cb9f57d6bcd8)
+++ PersistentAlarm.h	(.../PersistentAlarm.h)	(revision 4a760dadd92723113afea5d2d8a9722a979a38e8)
@@ -49,7 +49,8 @@
 #ifdef _HD_
 typedef enum
 {
-
+    PLACE_HOLDER = 0,
+    NUM_OF_FPGA_SENSOR_GROUPS,
 } FPGA_PERSISTENT_ALARMS_GROUP_T;
 #endif
 
Index: Timers.c
===================================================================
diff -u -r54a9bd09d6714d7faaa186959988a75ef3b83557 -r4a760dadd92723113afea5d2d8a9722a979a38e8
--- Timers.c	(.../Timers.c)	(revision 54a9bd09d6714d7faaa186959988a75ef3b83557)
+++ Timers.c	(.../Timers.c)	(revision 4a760dadd92723113afea5d2d8a9722a979a38e8)
@@ -26,7 +26,7 @@
 
 // ********** private data **********
 
-static U32 msTimerCount = 0;            ///< 1ms timer counter incremented by TaskTimer.c.
+static volatile U32 msTimerCount = 0;            ///< 1ms timer counter incremented by TaskTimer.c.
 
 /*********************************************************************//**
  * @brief