[v638] Backport recent fixes #2004

Job	Run time
create-and-upload-wheel-registry	-1s
test-wheel-cp${{ matrix.python-version }}	-1s
matrix.target	-9s
	-11s

Provide feedback