ref: refs/heads/manifest-fix
