Merge pull request #8001 from monishdeb/CRM-18219