Merge branch 'udpmem'