Moved stuff from master to win64 branch