Merge branch 'jk/output-prefix-cleanup'