Merge "Fix multicast API"