Original commit: elastic/x-pack-elasticsearch@5a908f5dcc
Original commit: elastic/x-pack-elasticsearch@ac651f51d4