Fork for fixes

utility/os2_stoip4.c/shortlog/shortlog@a0b1d0e6d237: not found in manifest