Merge "GenSpecialCase support for x86"