Original commit: elastic/x-pack-elasticsearch@64b67aa0ad
Original commit: elastic/x-pack-elasticsearch@970cfea67e