Merge branch 'dev' into refactor/npm-over-bunproc