Merge pull request #17867 from MegaphoneJon/mailing-70