Merge pull request #6362 from colemanw/CRM-14239