Merge pull request #9699 from jitendrapurohit/CRM-19003