Merge remote-tracking branch 'upstream/main' into remove-setuptools-wheel-upgrade