Bug 868600 - Safeguard alarm check
Merge pull request #9576 from KevinGrandon/bug_868600_safeguard_alarm_check

Bug 868600 - Safeguard alarm check