Merge branch 'hotfix/paths'