Merge "[optimizing] Improve x86, x86_64 code"