v3 of the enable_trace events patch