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