[v18.x backport] Backport a couple of PRs#49618

atlowChemi wants to merge 2 commits intonodejs:v18.x-stagingnodejs/node:v18.x-stagingfrom

atlowChemi:backport-47775-and-48521-to-18atlowChemi/node:backport-47775-and-48521-to-18Copy head branch name to clipboard