Merge pull request #8717 from monishdeb/CRM-19094