Merge pull request #396 from yashodha/CRM-12274

CRM-12274
CRM-12274