Reduce the frequency of sending mail
Merge branch 'develop'