Merge pull request #8725 from colemanw/CRM-17608