Merge pull request #1806 from pratik-joshi/CRM-13604