Merge pull request #1250 from dimaqq/upstream-type-fixes #1340

Job	Run time
Validate (3.10)	29s
Build test (3.10)	27s
Unit tests (3.8)	34s
Unit tests (3.9)	22s
Unit tests (3.10)	33s
Unit tests (3.11)	24s
Unit tests (3.12)	31s
Unit tests (3.13)	36s
Quarantined Integration Tests (3.10, 3.1/stable)	38m 7s
Integration (3.10, 3.1/stable, True)	34m 18s
Quarantined Integration Tests (3.10, 3.3/stable)	1s
Integration (3.10, 3.1/stable, False)	31m 48s
Quarantined Integration Tests (3.10, 3.4/stable)	41m 30s
Integration (3.10, 3.3/stable, True)	32m 48s
Quarantined Integration Tests (3.10, 3.5/stable)	44m 3s
Integration (3.10, 3.3/stable, False)	0s
Quarantined Integration Tests (3.10, 3.6/stable)	43m 49s
Integration (3.10, 3.4/stable, True)	35m 3s
Integration (3.10, 3.4/stable, False)	33m 19s
Integration (3.10, 3.5/stable, True)	1s
Integration (3.10, 3.5/stable, False)	35m 49s
Integration (3.10, 3.6/stable, True)	1s
Integration (3.10, 3.6/stable, False)	33m 24s
	6h 47m 57s

Provide feedback