Upcoming changes for Enhanced Alerting