Merge pull request #2417 from monishdeb/CRM-13981