Original commit: elastic/x-pack-elasticsearch@8a30126721
Original commit: elastic/x-pack-elasticsearch@e56dcf6066