[v11.x-backport] Backport 24861 to v11.x - #25258

[v11.x-backport] Backport 24861 to v11.x#25258

gabrielschulhof wants to merge 2 commits into

nodejs:v11.x-stagingnodejs/node:v11.x-stagingfrom

gabrielschulhof:backport-24861-to-v11.xgabrielschulhof/node:backport-24861-to-v11.xCopy head branch name to clipboard