Merge pull request #4557 from monishdeb/CRM-15536