+ Fix some others multi options Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com> Upstream-commit: cc77fc3cb27c90568857c80d08787806d35aa5c8 Component: engine