Merge pull request #17806 from demeritcowboy/mail-report-csv-bom