Merge pull request #7917 from jitendrapurohit/CRM-17182additional