patch for RT#85361
tweaking the patch
Merge branch 'udp'