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

CRM-12503