Merge "Bug fix: Protect TSP prints with lock" into integration