Merge pull request #6532 from colemanw/CRM-12527-2