Original commit: elastic/x-pack-elasticsearch@1317e8a435
Original commit: elastic/x-pack-elasticsearch@b70f48d25c