Merge branch 'jh/trace2'