Merge pull request #1862 from pratik-joshi/CRM-13649