[9.3] Backport #2962#2966

picandocodigo merged 2 commits into

9.3elastic/elasticsearch-ruby:9.3from

backport_2962_9.3elastic/elasticsearch-ruby:backport_2962_9.3Copy head branch name to clipboard