Merge pull request #7254 from monishdeb/CRM-17417