Original commit: elastic/x-pack-elasticsearch@9ddb39bdc6
Original commit: elastic/x-pack-elasticsearch@aad60b86a8