Merge pull request #19163 from jdavcs/dev_merge_migration_heads #1169

Job	Run time
build-client / build-client	10m 11s
setup-selenium / setup_chromedriver	5s
Test (3.8, 0)	43m 22s
Test (3.8, 1)	55m 19s
Test (3.8, 2)	53m 51s
	2h 42m 48s

Provide feedback