Merge branch 'backport-macos-curl-backend' into macos-curl-backend