Fork for fixes

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