Re: rebasing staging, rebuilding