Merge branch 'js/t5404-path-fix'