Fixes #27843 Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Upstream-commit: 94bc15016e Component: cli
94bc15016e