Merge pull request #1694 from pradpnayak/CRM-13340