Merge "Rework Glance alerts"