Merge pull request #3682 from monishdeb/CRM-14969