Original commit: elastic/x-pack-elasticsearch@931bc10498
Original commit: elastic/x-pack-elasticsearch@485ddb14f2