local manifests and cherry-picks/patches