Merge pull request #16265 from seamuslee001/fix_flexmailer