worked on CRM-12357
Merge pull request #614 from kurund/CRM-12357

worked on CRM-12357