Fork for fixes

utility/uip-conf.h/shortlog@a156d3de5647: not found in manifest