Merge pull request #4694 from monishdeb/CRM-15626