worked on CRM-13366
Merge pull request #1630 from yashodha/CRM-13366

worked on CRM-13366