Merge pull request #1777 from monishdeb/CRM-12653