Merge "Re-evaluate when the network resumes" into main