Merge "Fix arm64 and x86_64 code generator assertion"