Merge pull request #18749 from totten/master-crmMailing-factory