Original commit: elastic/x-pack-elasticsearch@8fd9850377
Original commit: elastic/x-pack-elasticsearch@c4fee26b37