Upgrading mailout report to work with new database design
Merge remote branch 'origin/release' into develop