Merge branch 'jh/trace2-pretty-output'