solves ticket 2350
Merge pull request #157 from igal-getrailo/jira-2350b

Jira 2350b