Add more information to the generated YAML for documentation Upstream-commit: 37ac97c72e Component: cli
37ac97c72e