Merge branch 'js/abspath-part-inside-repo'