Original commit: elastic/x-pack-elasticsearch@57b37e8d5f
Original commit: elastic/x-pack-elasticsearch@b70f48d25c