Merge pull request #1779 from pratik-joshi/CRM-13563