Cherry-pick release 8.3.5 #6193

Job	Run time
package	27s
build (windows-py39-unittestextras)	22m 8s
build (windows-py39-pluggy)	6m 54s
build (windows-py39-xdist)	6m 57s
build (windows-py310)	6m 58s
build (windows-py311)	16m 55s
build (windows-py312)	17m 0s
build (windows-py313)	18m 59s
build (ubuntu-py39-lsof-numpy-pexpect)	24m 40s
build (ubuntu-py39-pluggy)	5m 48s
build (ubuntu-py39-freeze)	44s
build (ubuntu-py39-xdist)	5m 33s
build (ubuntu-py310-xdist)	5m 53s
build (ubuntu-py311)	17m 24s
build (ubuntu-py312)	20m 32s
build (ubuntu-py313-pexpect)	17m 21s
build (ubuntu-pypy3-xdist)	7m 56s
build (macos-py39)	5m 55s
build (macos-py310)	5m 6s
build (macos-py312)	4m 13s
build (macos-py313)	5m 1s
build (doctesting)	45s
build (plugins)	57s
check	2s
	3h 44m 8s

Provide feedback