Merge pull request #7403 from monishdeb/CRM-17308