[v9.x] backport 18656 + 19002

Can't show this merge request because the source branch github/fork/addaleax/backport-v9.x-19002 is missing from project rodrigo-test/test-group-nodejs/node. Close this merge request or update the source branch.