Fixed email alert feature
Merge branch 'develop' into staging