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