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