Revert 64bit change, Revert Update Api Pack and Fix Last Merge