Pull up changes from i386