Refloat cherry-picks from #18196#18360

ofrobots wants to merge 3 commits into

nodejs:masternodejs/node:masterfrom

ofrobots:reland-18196ofrobots/node:reland-18196Copy head branch name to clipboard