Merge pull request #6476 from monishdeb/CRM-16950