Merge pull request #7916 from jitendrapurohit/CRM-18037upgrade