Merge branch 'gb/refactor-pathinfo'