Original commit: elastic/x-pack-elasticsearch@b35c192536
Original commit: elastic/x-pack-elasticsearch@cda37f6d85