Fix merge conflicts with adding slash splitting
Merge branch 'igor-shevchenko-slash-splitter'