master
Moved the trace-generated code in `trace` package from the public API to the internal packages (#2172)