Merge pull request #1625 from pradpnayak/CRM-13340