Merge pull request #1800 from monishdeb/CRM-13601