chore: update main with outstanding fixes on v16.x.x branch#4171

yaacovCR merged 3 commits intographql:maingraphql/graphql-js:mainfrom

yaacovCR:cherry-pickyaacovCR/graphql-js:cherry-pickCopy head branch name to clipboard