Changed on linker/autoupdater. Don't merge