CP-6958 - Convert to compile 64bit

Committing to github on behalf of Malcom Crossley