Merge pull request #7886 from sarehag/CRM-18114