Cleanup: integration-cli ('%s' with %q) Upstream-commit: b3cda9fc7e9dbdc23619c84ed91ad41d931b6e27 Component: engine