Merge pull request #996 from pradpnayak/CRM-12794