Merge pull request #9379 from colemanw/CRM-17335