Merge pull request #9320 from colemanw/CRM-19543