Merge pull request #11456 from jitendrapurohit/CRM-21598