Fork for fixes

utility/util.h/shortlog@4acb22344932: not found in manifest