Merge pull request #6399 from colemanw/CRM-16705