Original commit: elastic/x-pack-elasticsearch@31b17e5115
Original commit: elastic/x-pack-elasticsearch@344c7c2458