Merge pull request #11222 from jitendrapurohit/CRM-21380