Merge "[572227] Add an option for headless text output without a zip"