Merge pull request #6443 from colemanw/CRM-12527