Further cool down email cleanup
Merge branch 'master' into hs_staging