always add but hide experimental cmds and flags Upstream-commit: f6edbdf8835359a83e9d5786ffe09d176609fb07 Component: engine