Merge pull request #186 from epam/dev

Sync with dev branch [ci skip]
Merge pull request #188 from epam/dev

Master sync with dev branch
Merge pull request #190 from epam/master

Sync with dev branch [ci skip]