Merge remote-tracking branch 'upstream/patch_disable-gnutls-verify' into main