Merge pull request #1960 from pratik-joshi/CRM-13730