prevent flag grouping with -- Upstream-commit: 93f925c5336489e7c47f9471cfa89a8c6b7a850e Component: engine