Rebase of EKR's patches for tracing and frame size