Merge pull request #8060 from monishdeb/CRM-17360