Merge branch 'release_22.01' into release_22.05 #9146

Job	Run time
setup-selenium / setup_chromedriver	6s
Test (3.7, 0)	46m 49s
Test (3.7, 1)	43m 16s
Test (3.7, 2)	45m 33s
	2h 15m 44s

Provide feedback