Original commit: elastic/x-pack-elasticsearch@96fc01391e
Original commit: elastic/x-pack-elasticsearch@c28e6e0199