Merge pull request #2206 from pratik-joshi/CRM-13907