Merge "[CDS] BP Request tracing"