[4.0] Change common tc files