Merge pull request #6372 from colemanw/CRM-14647