Merge pull request #7876 from sarehag/CRM-17508