Fixes #11008 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: df39b0146b Component: cli
df39b0146b