Merge branch 'jh/trace2-sid-fix'