Closes #10278 Signed-off-by: Brian Goff <cpuguy83@gmail.com> Upstream-commit: 209f3889e0 Component: cli
209f3889e0