Original commit: elastic/x-pack-elasticsearch@aa4ad288dc
Original commit: elastic/x-pack-elasticsearch@f41ff1c993