Merge "Reevaluate when underlying network changes"