Merge "SF: Add continuous transaction tracing"