Merge pull request #1357 from monishdeb/CRM-12812