Merge pull request #4907 from monishdeb/CRM-15695