Merge branch 'ps/fetch-output-format'