Merge pull request #9134 from jitendrapurohit/CRM-19423