Merge pull request #9124 from mlutfy/master-crm17991