Fixes #10673. Signed-off-by: Rick Wieman <git@rickw.nl> Upstream-commit: acc0eac695 Component: cli
acc0eac695