Merge branch 'js/checkout-untracked-symlink' into next