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