Merge branch 'output_refactoring'