Merge pull request #8416 from monishdeb/CRM-18322