[9.0] Backports #2677#2678

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

backport_2677elastic/elasticsearch-ruby:backport_2677Copy head branch name to clipboard