Merge pull request #8422 from colemanw/CRM-18586