Merge pull request #6194 from colemanw/CRM-16795