[v10.x backport] backport 23233, 22938

Backport of #23233 and #22938.

CI:

• https://ci.nodejs.org/job/node-test-pull-request/17718/
• https://ci.nodejs.org/job/node-test-pull-request/17724/
• https://ci.nodejs.org/job/node-test-pull-request/17811/