[v638] Backport of recent fixes #2111

Job	Run time
cp313-manylinux_x86_64	1h 29m 3s
cp39-manylinux_x86_64	1h 30m 37s
cp311-manylinux_x86_64	1m 41s
cp310-manylinux_x86_64	1h 31m 23s
cp312-manylinux_x86_64	1h 30m 18s
test-wheel-cp${{ matrix.python-version }}	0s
create-and-upload-wheel-registry	0s
	6h 3m 2s

Provide feedback