Merge pull request #817 from pradpnayak/CRM-12470