[9.0] Backports #2618#2620

picandocodigo merged 2 commits into9.0elastic/elasticsearch-ruby:9.0from

backport_2618elastic/elasticsearch-ruby:backport_2618Copy head branch name to clipboard