Merge "TSP: Fix GCC 11.0.0 compilation error." into integration