(Modules-1247) Support x64