Merge pull request #5794 from colemanw/CRM-16462