[v18.x backport] backport 49574 and 50240 to v18.x#52384

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

lpinca:backport-49574-and-50240-to-v18.xlpinca/node:backport-49574-and-50240-to-v18.xCopy head branch name to clipboard