Merge "Object model changes to support 64bit."