Merge "Improve network avoidance"