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