Merge pull request #21421 from nxhack/node_18161