Merge branch 'js/find-lib-h-with-ls-files-when-possible'