Original commit: elastic/x-pack-elasticsearch@4afbf69ce2
Original commit: elastic/x-pack-elasticsearch@15caf307c4