Merge #934

[stubailo]

TODO:

• If this PR is a new feature, reference an issue where a consensus about the design was reached (not necessary for small changes)
• Make sure all of the significant new logic is covered by tests
• Rebase your changes on master so that they can be merged easily
• Make sure all tests and linter rules pass
• Update CHANGELOG.md with your change
• Add your name and email to the AUTHORS file (optional)
• If this was a change that affects the external API, update the docs and post a link to the PR in the discussion

[stubailo]

OK I have learned that merging this needs to coordinate with merging basically every other PR to switch to @types/graphql at the exact same time, so we shouldn't do it while @helfer is out.

[intellix]

LGTM. I guess I missed a few after the rebase :) Thanks

[helfer]

This is going to be fun 👷