Merge pull request #670 from pratik-joshi/CRM-12503