Fixes #12116 Signed-off-by: David Calavera <david.calavera@gmail.com> Upstream-commit: 51fee8e7ae Component: cli
51fee8e7ae