Original commit: elastic/x-pack-elasticsearch@c61133ed12
Original commit: elastic/x-pack-elasticsearch@b70f48d25c