Merge pull request #6371 from colemanw/CRM-16891