Merge pull request #6401 from colemanw/CRM-10836