MODE-2260: Fixes navigation using path's segments
Merge pull request #1183 from okulikov/MODE-2260

MODE-2260: Fixes navigation using path's segments