Original commit: elastic/x-pack-elasticsearch@80317c063b
Original commit: elastic/x-pack-elasticsearch@e54aa1fd0a