Original commit: elastic/x-pack-elasticsearch@f9fa3b813a
Original commit: elastic/x-pack-elasticsearch@666a10bd23