Index: NVDataMgmt.c
===================================================================
diff -u -rccbdbdb98dc4d8c11cacade96002284d7d41d2d6 -rbc8e6282b66b86f678cf2f7d9195250e3d243354
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision ccbdbdb98dc4d8c11cacade96002284d7d41d2d6)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision bc8e6282b66b86f678cf2f7d9195250e3d243354)
@@ -2564,7 +2564,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_MANAGEMENT_OPS_TIMEOUT, state )
 #endif
 #ifdef _HD_
-
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_MANAGEMENT_OPS_TIMEOUT, state )
 #endif
         status = TRUE;
     }
Index: RTC.c
===================================================================
diff -u -rccbdbdb98dc4d8c11cacade96002284d7d41d2d6 -rbc8e6282b66b86f678cf2f7d9195250e3d243354
--- RTC.c	(.../RTC.c)	(revision ccbdbdb98dc4d8c11cacade96002284d7d41d2d6)
+++ RTC.c	(.../RTC.c)	(revision bc8e6282b66b86f678cf2f7d9195250e3d243354)
@@ -1172,7 +1172,12 @@
     else if ( RTCServiceState == RTC_SERVICE_COMPLETE )
     {
         releaseSemaphore( SEMAPHORE_RTC );
+#ifdef _DG_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
         result                 = RTC_EXEC_STATE_IDLE;
         hasWriteToRTCRequested = FALSE;
     }
@@ -1207,7 +1212,12 @@
     else if ( RTCServiceState == RTC_SERVICE_COMPLETE )
     {
         releaseSemaphore( SEMAPHORE_RTC );
+#ifdef _DG_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
         result = RTC_EXEC_STATE_IDLE;
     }
 
@@ -1241,7 +1251,12 @@
         releaseSemaphore( SEMAPHORE_RTC );
 
         RTCRAMStatus = RTC_RAM_STATUS_FAILED;
+#ifdef _DG_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
         result                 = RTC_EXEC_STATE_IDLE;
         hasWriteToRAMRequested = FALSE;
     }
@@ -1276,7 +1291,12 @@
         releaseSemaphore( SEMAPHORE_RTC );
 
         RTCRAMStatus = RTC_RAM_STATUS_FAILED;
+#ifdef _DG_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
         result                  = RTC_EXEC_STATE_IDLE;
         hasReadFromRAMRequested = FALSE;
     }
@@ -1313,7 +1333,6 @@
 #ifdef _DG_
             broadcastData( MSG_ID_DG_RTC_EPOCH, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) );
 #endif
-
 #ifdef _HD_
             broadcastData( MSG_ID_RTC_EPOCH, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) );
 #endif
@@ -1326,7 +1345,12 @@
     else if ( RTC_SERVICE_COMPLETE == RTCServiceState )
     {
         releaseSemaphore( SEMAPHORE_RTC );
+#ifdef _DG_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
         result = RTC_EXEC_STATE_IDLE;
     }