Merge pull request #8365 from saurabhbatra96/CRM-18537