Original commit: elastic/x-pack-elasticsearch@94a2379d74
Original commit: elastic/x-pack-elasticsearch@d05f0280a3