Original commit: elastic/x-pack-elasticsearch@46cb23d583
Original commit: elastic/x-pack-elasticsearch@081ba8aa5d