Merge branch 'deif-improve-javascript-performance' into deploy
Add parameter for custom mail class.
Merge branch 'deif-mail-customization'