Merge "Increase the test timeout" into main