Fork for fixes

utility/util.h/shortlog@01c2344f98a3: not found in manifest