GI-1296 build for 64-bit