Merge pull request #7909 from monishdeb/CRM-18118