fixed bug with non closed alerts
Merge branch 'master' into production