Fork for fixes

utility/common_functions.h/shortlog@a0b1d0e6d237: not found in manifest