Merge pull request #8086 from monishdeb/CRM-18343