Merge pull request #4494 from monishdeb/CRM-15556