Automatic merge from submit-queue (batch tested with PRs 38617, 38620) Increase timeout for waiting for nodes