Fine tuned alerts
Merge branch 'staging'