Merge pull request #3699 from monishdeb/CRM-14996