Merge pull request #5005 from colemanw/CRM-15872