Index: NVDataMgmt.c
===================================================================
diff -u -r2f776181b1c9170e2bfa867276b31dd1daccd326 -r5ae8aa4f20756e41805c0259c4e5b7f56f523240
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 2f776181b1c9170e2bfa867276b31dd1daccd326)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 5ae8aa4f20756e41805c0259c4e5b7f56f523240)
@@ -3056,8 +3056,6 @@
         // Recalculate the CRC with the default values
         dgSWConfigGroup.crc = crc16( (U08*)&dgSWConfigGroup, sizeof( DG_SW_CONFIG_GROUP_T ) - sizeof(U16) );
 
-        //activateAlarmNoData( ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC ); // TODO remove
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
@@ -3074,8 +3072,6 @@
         // Recalculate the CRC with the default values
         hdSWConfigGroup.crc = crc16( (U08*)&hdSWConfigGroup, sizeof( HD_SW_CONFIG_GROUP_T ) - sizeof(U16) );
 
-        //activateAlarmNoData( ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC ); // TODO remove
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
Index: RTC.c
===================================================================
diff -u -r33643a3ab1bcec2cd9b71e2977cb7c40750229c0 -r5ae8aa4f20756e41805c0259c4e5b7f56f523240
--- RTC.c	(.../RTC.c)	(revision 33643a3ab1bcec2cd9b71e2977cb7c40750229c0)
+++ RTC.c	(.../RTC.c)	(revision 5ae8aa4f20756e41805c0259c4e5b7f56f523240)
@@ -718,6 +718,9 @@
 #ifdef _DG_
     alarm = ALARM_ID_DG_RTC_CONFIG_ERROR;
 #endif
+#ifdef _HD_
+    alarm = ALARM_ID_HD_RTC_CONFIG_ERROR;
+#endif
 
 #ifndef DISABLE_RTC_CONFIG
     U16 controlReg1 = rxBuffer[ RTC_REG_1_INDEX ];