Merge pull request #8415 from monishdeb/CRM-18159