Merge upstream, branch off rest-api.