Original commit: elastic/x-pack-elasticsearch@0206648252
Original commit: elastic/x-pack-elasticsearch@b70f48d25c