Merge branch 'jx/relative-path-regression-fix'