merge  x64 into master, x64 conversion is done