Original commit: elastic/x-pack-elasticsearch@4a024138cc
Original commit: elastic/x-pack-elasticsearch@f084b626ce