Merge branch 'ab/trace2-typofix'