Copied from the offical root repository, mods to port new newer versions of vc