Fork for fixes

utility/util.h/shortlog/shortlog@53715cc81c63: not found in manifest