Merge pull request #7969 from monishdeb/CRM-18224