Base: Minimize network requests and fix master on manual