Merge pull request #23743 from stangri/master-nghttp3