2 Commits (output-generator-tweaks)