Fork for fixes

utility/uip.h/shortlog@7648334eb41b: not found in manifest