XD-915: Apply to tcp modules