Update to double-dash everywhere Upstream-commit: 212a870734b5be597579e59bfb8758c3b3198144 Component: engine