Merge branch 'tcp_metrics-series-of-fixes'