Merge branch 'js/symlink'