alert update
Merge branch 'master' into authenticate
updated for alerts