Merge pull request #6731 from pradpnayak/CRM-17208