Fix non-portable#225

KiritoDv merged 7 commits intoHarbourMasters:mainHarbourMasters/Starship:mainfrom

Alto1772:non-portable-fixAlto1772/Starship:non-portable-fixCopy head branch name to clipboard