Merge pull request #1000 from pradpnayak/CRM-12799