Original commit: elastic/x-pack-elasticsearch@e2341e49ea
Original commit: elastic/x-pack-elasticsearch@b938c19695