Merge "Fix an argument to the legacy broadcast"