Merge pull request #1683 from pradpnayak/CRM-12970