Merge pull request #7707 from mlutfy/4.7-crm17914