Merge pull request #9624 from colemanw/CRM-19829