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