Merge branch 'backport-curl-socks5-fix' into release-3.26

Merge-request: !8872