Merge pull request #1425 from pratik-joshi/CRM-13213