Merge "TSP: corrected log information" into integration