Merge "Improve broadcast tracing"