Merge pull request #8102 from monishdeb/CRM-18349