Merge "Fix "alarms in flight?" reporting"