Merge branch 'js/test-ln-s-add' into maint