Fixes #7354
Merge pull request #7387 from mwerezak/alarms

Fixes #7354