Merge pull request #7803 from saurabhbatra96/CRM-17143