Original commit: elastic/x-pack-elasticsearch@b35c192536
Original commit: elastic/x-pack-elasticsearch@88b1619192