Fixes #9550 Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk> Upstream-commit: 6a94570d5a Component: cli
6a94570d5a