Original commit: elastic/x-pack-elasticsearch@6147e32fd1
Original commit: elastic/x-pack-elasticsearch@e54aa1fd0a