Merge pull request #4997 from monishdeb/CRM-15536