Merge branch 'fix/report-email' into 'develop'