Merged x64-bit support