Issue #28649: fix-typing-test-v2.diff (3.6->3.7)