Merge pull request #7992 from jitendrapurohit/CRM-18255