Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r36d1ef937465bb38a3ec80c329bd933fb3daeda5 -r68d1bb7585a72c6d46608bb7d84da14220b78796
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 36d1ef937465bb38a3ec80c329bd933fb3daeda5)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 68d1bb7585a72c6d46608bb7d84da14220b78796)
@@ -74,7 +74,7 @@
     SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1 = 43,
     SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2 = 44,
     SW_FAULT_ID_FPGA_INVALID_STATE = 45,
-    SW_FAULT_ID_AVAILABLE_1 = 46,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS = 46,
     SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA = 47,
     SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA = 48,
     SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA = 49,
@@ -99,6 +99,9 @@
     SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED1 = 68,
     SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED2 = 69,
     SW_FAULT_ID_SAFETY_SHUTDOWN_INVALID_SELF_TEST_STATE = 70,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_RANK = 71,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR_COND = 72,
+    SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3 = 73,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/AlarmMgmtTD.c
===================================================================
diff -u -r01892698468068bb97a80a84c96a6d7c5d6fde9b -r68d1bb7585a72c6d46608bb7d84da14220b78796
--- firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision 01892698468068bb97a80a84c96a6d7c5d6fde9b)
+++ firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision 68d1bb7585a72c6d46608bb7d84da14220b78796)
@@ -179,8 +179,6 @@
     // Initialize alarm states and start time stamps
     for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
     {
-        setAlarmActive( a, FALSE );
-        setAlarmConditionDetected( a, FALSE );
         alarmStartedAt[ a ].data = 0;
         alarmStartedAt[ a ].ovData = 0;
         alarmStartedAt[ a ].ovInitData = 0;