(MODULES-1176) x64 Compatibility