Merge branches 'tracing/profiling', 'tracing/options' and 'tracing/urgent' into tracing/core