Merge "[optimizing] More x86_64 code improvements"