Add mailing configuration
Revert "Add mailing configuration"

This reverts commit 6e3484a5cffcd97e4b77ebed926cf734a52456a1.
Add mailing configuration
Merge branch 'release/4'