Merge pull request #7691 from jitendrapurohit/CRM-17863