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