Add fix for future-required-type-annotation
#8711
Merged
future-required-type-annotation
#8711