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