Merge "Competing network interfaces"