Merge pull request #3841 from monishdeb/CRM-15108