Merge "Add more info in BBQ Tracing"