Merge pull request #6128 from colemanw/CRM-16676