Merge pull request #7995 from monishdeb/CRM-18071