Index: NVDataMgmt.c
===================================================================
diff -u -rd136ddf60da3be5d1e1bb83af7221927f4cfea25 -rdaa771cd56143d94152b4a72821901d54d0f5902
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d136ddf60da3be5d1e1bb83af7221927f4cfea25)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision daa771cd56143d94152b4a72821901d54d0f5902)
@@ -908,6 +908,7 @@
                         BOOL scheduleStatus = enqueueSector0Records();
 
                         // Signal that there is a new calibration record available.
+                        // NOTE: as of now, this signal will be sent even after the system record is sent
                         newCalStartTimer    = getMSTimerCount();
                         isNewCalAvailable   = TRUE;
                     }
@@ -1236,12 +1237,7 @@
     value = dgSWConfigGroup.dgSWConfigsRecord.swConfigs[ config ];
 #endif
 #ifdef _HD_
-    HD_OP_MODE_T opMode = getCurrentOperationMode();
-
-   if ( ( MODE_FAUL == opMode ) || ( MODE_SERV == opMode ) || ( MODE_STAN == opMode ) )
-   {
-       value = hdSWConfigGroup.hdSWConfigsRecord.swConfigs[ config ];
-   }
+   value = hdSWConfigGroup.hdSWConfigsRecord.swConfigs[ config ];
 #endif
 #endif
 
Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -ra81f873d234c5eb7706fbe4dd2f0be3e934909d5 -rdaa771cd56143d94152b4a72821901d54d0f5902
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision a81f873d234c5eb7706fbe4dd2f0be3e934909d5)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision daa771cd56143d94152b4a72821901d54d0f5902)
@@ -45,8 +45,10 @@
     SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS,
     SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS,
     SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS,
+    SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS,
     SW_CONFIG_DISABLE_SYRINGE_PUMP,
     SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS,
+    SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS,
     SW_CONFIG_DISABLE_PRESSURE_CHECKS,
     SW_CONFIG_DISABLE_ARTERIAL_PRESSURE_CHECK,
     SW_CONFIG_DISABLE_VENOUS_PRESSURE_CHECK,