Merge branch 'tl/trace2-config-scope'