Original commit: elastic/x-pack-elasticsearch@267084f163
Original commit: elastic/x-pack-elasticsearch@b70f48d25c