Merge pull request #1042 from pratik-joshi/CRM-12870