Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core