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