Merge pull request #10876 from mlutfy/master-crm20468