[master] Tp timeout improve