Merge pull request #17328 from eileenmcnaughton/mailing_seach