Merge pull request #1676 from shackbarth/24104-npm