Merge branch 'esegev'
Removed test alert
Merge branch 'master' into esegev