Merge "Fix to show cli subcommand help message"