Merge pull request #6909 from colemanw/CRM-12527