Original commit: elastic/x-pack-elasticsearch@eb68a4d3ae
Original commit: elastic/x-pack-elasticsearch@123738556e