Fork for fixes

utility/uip.h/shortlog@647d53d146f1: not found in manifest