Merge pull request #9000 from ravi-sharma/dev/CRM-19323