Merge "Fix stream-tracing with default methods"