Merge pull request #6111 from colemanw/CRM-11856