Merge branch 'sg/trace2-rename'