Fork for fixes

utility/uip_debug.cpp/shortlog@a156d3de5647: not found in manifest