Merge "Remove use of internal Trace method." into main