Merge pull request #6671 from pradpnayak/CRM-17145