repatched for jira-1377 for branch 4.1
Merge pull request #284 from igal-getrailo/jira-1377b

repatched for jira-1377 for branch 4.1