major changes related to tracing.
CR changes.