Fork for fixes

utility/Udp.h/shortlog@a156d3de5647: not found in manifest