Merge remote-tracking branch 'aft90/merge-output-format'