* Builder: Move the Builder to the client Upstream-commit: d37dea318e5e3b6813f26ef04f635339f6821026 Component: engine