Merge branch 'reports/fix-remote-reporting-emails' into 'develop'