Fixes #6761 - lazy loaded subcommands