Merge pull request #6129 from colemanw/CRM-16793