Update with brood's latest manifest and pull everything but build and vendor oct from him