manifest: updates from upstream