Merge "Output additional trace points for each frame"