MOSYNC-2989 plus UDP broadcast fix