Merge pull request #6601 from colemanw/CRM-16974