Merge pull request #9681 from jitendrapurohit/CRM-19884