Merge pull request #6172 from colemanw/CRM-16811