Original commit: elastic/x-pack-elasticsearch@8abbf7468b
Original commit: elastic/x-pack-elasticsearch@15caf307c4