Merge pull request #4057 from monishdeb/CRM-15086