refactor: separate graph from image Upstream-commit: 00b8fec75f3a113c851013e0f0d559cc6d96b84d Component: engine