adopt latest rest-core