Fork for fixes

utility/util.h/shortlog@5b17e4656dd0: not found in manifest