verified the work on CRM-12395
Merge pull request #515 from kurund/CRM-12395

verified the work on CRM-12395