7 Commits (output-generator-tweak)