fd-95 for 4.1 branch
Merge pull request #214 from igal-getrailo/fd-95-41

fd-95 for 4.1 branch