Merge pull request #6472 from colemanw/CRM-16809