CHRON-45 refactored multicast code