CP-6958 - Convert to compile 64bit