Merge branch 'js/submodule-relative'