Merge pull request #6220 from monishdeb/CRM-16828