Merge pull request #1502 from pratik-joshi/CRM-13026