Merge pull request #8806 from mlutfy/master-crm19168