Merge "Fix for devices with multiple multicast-capable interfaces"