Merge "Improve socket timeout test error message" into main