Merge upstream, branch rest-api.