Merge pull request #5961 from colemanw/CRM-16577