Merge branch 'udp-a-few-fixes'