Merge pull request #2137 from pradpnayak/CRM-13310