rebase: add tracing support