Fork for fixes

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