improvements to cool down email
Merge branch 'master' into hs_staging