Merge branch 'output_api'