Merge pull request #3580 from monishdeb/CRM-14701