Index: NVDataMgmt.c
===================================================================
diff -u -r82fa83e4d882fdcd96b4b5bdf706044d45a82c70 -r5072f6150977593c7a73abb4afac386d46081ee3
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 82fa83e4d882fdcd96b4b5bdf706044d45a82c70)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 5072f6150977593c7a73abb4afac386d46081ee3)
@@ -3826,18 +3826,6 @@
         enqueueRecordJob( NVDATAMGMT_READ, location, record );
     }
 
-    /*enqueueRecordJob( NVDATAMGMT_READ, NVDATAMGMT_EEPROM, NVDATAMGMT_CALIBRATION_RECORD );
-    enqueueRecordJob( NVDATAMGMT_READ, NVDATAMGMT_EEPROM, NVDATAMGMT_SYSTEM_RECORD );
-    enqueueRecordJob( NVDATAMGMT_READ, NVDATAMGMT_EEPROM, NVDATAMGMT_SERVICE_RECORD );
-    enqueueRecordJob( NVDATAMGMT_READ, NVDATAMGMT_RTC,    NVDATAMGMT_USAGE_INFO_RECORD );
-#ifdef _DG_
-    enqueueRecordJob( NVDATAMGMT_READ, NVDATAMGMT_RTC, NVDATAMGMT_SCHEDULED_RUNS_RECORD );
-#endif
-
-#ifndef _RELEASE_
-    enqueueRecordJob( NVDATAMGMT_READ, NVDATAMGMT_RTC, NVDATAMGMT_SW_CONFIG_RECORD );
-#endif*/
-
     // Set the status to records were queued successfully
     recordsReadStatus = NVDATAMGMT_RECORDS_QUEUED;
 }
Index: Utilities.c
===================================================================
diff -u -r82fa83e4d882fdcd96b4b5bdf706044d45a82c70 -r5072f6150977593c7a73abb4afac386d46081ee3
--- Utilities.c	(.../Utilities.c)	(revision 82fa83e4d882fdcd96b4b5bdf706044d45a82c70)
+++ Utilities.c	(.../Utilities.c)	(revision 5072f6150977593c7a73abb4afac386d46081ee3)
@@ -680,7 +680,12 @@
     }
     else if ( TRUE == didTimeout( sempahoreStatus[ s ].semaphoreStartTimeMS, SEMAPHORE_IN_USE_TIMEOUT_MS ) )
     {
+#ifdef _DG_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
+#endif
     }
     _enable_IRQ();