Merge branch 'backport-curl-fix' into release