Merge pull request #11481 from jitendrapurohit/CRM-21622