Backport of "Add some missing nullable annotations" into 1.18
Backport of !678 (merged) "Add some missing nullable annotations".
Commits:
- 20f6a2ec Add some missing nullable annotations
Backport of !678 (merged) "Add some missing nullable annotations".
Commits: