Merge branch 'tcp-tsq-perf'