Original commit: elastic/x-pack-elasticsearch@77fe30f7d3
Original commit: elastic/x-pack-elasticsearch@a5f96bd7a2