Merge "sync: add tracepoint support"