Change multi-type parameters to single type Upstream-commit: 7db57f7fcac33583403d1d4ccf52b1c27f7e0ad1 Component: engine