Merge pull request #390 from yashodha/CRM-12274

Crm 12274
CRM-12274