Merge pull request #5589 from systemcrash/multi_to_unicast