Merge pull request #4545 from monishdeb/CRM-15361